diff options
author | Nathan Scott <nathans@sgi.com> | 2003-08-27 05:40:58 +0000 |
---|---|---|
committer | Nathan Scott <nathans@sgi.com> | 2003-08-27 05:40:58 +0000 |
commit | d0369347d419fead26ecb00af7e44d82872f633f (patch) | |
tree | dadee78d1560cd59ea855c151763a4d8538eb60a | |
parent | c061323a613bdf17b35dea9aece285f06273a0d1 (diff) | |
download | attr-d0369347d419fead26ecb00af7e44d82872f633f.tar.gz |
Merge acl/attr libmisc fixes from Ben Escoto via AndreasG
-rw-r--r-- | VERSION | 2 | ||||
-rw-r--r-- | debian/changelog | 6 | ||||
-rw-r--r-- | doc/CHANGES | 3 | ||||
-rw-r--r-- | libmisc/quote.c | 6 |
4 files changed, 13 insertions, 4 deletions
@@ -3,5 +3,5 @@ # PKG_MAJOR=2 PKG_MINOR=4 -PKG_REVISION=8 +PKG_REVISION=9 PKG_BUILD=0 diff --git a/debian/changelog b/debian/changelog index cb97f59..b0b97dd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +attr (2.4.9-1) unstable; urgency=low + + * New upstream release + + -- Nathan Scott <nathans@debian.org> Wed, 27 Aug 2003 15:27:47 +1000 + attr (2.4.8-1) unstable; urgency=low * New upstream release diff --git a/doc/CHANGES b/doc/CHANGES index 33ff44c..592030e 100644 --- a/doc/CHANGES +++ b/doc/CHANGES @@ -1,3 +1,6 @@ +attr-2.4.9 (04 August 2003) + - Fix issues in the libmisc quote routine (from Ben Escoto). + attr-2.4.8 (04 August 2003) - Make quote/unquote return NULL if passed NULL. diff --git a/libmisc/quote.c b/libmisc/quote.c index fdd3af9..3efe9cf 100644 --- a/libmisc/quote.c +++ b/libmisc/quote.c @@ -35,16 +35,16 @@ const char *quote(const char *str) return str; for (nonpr = 0, s = (unsigned char *)str; *s != '\0'; s++) - if (!isprint(*s) || isspace(*s) || *s == '\\') + if (!isprint(*s) || isspace(*s) || *s == '\\' || *s == '=') nonpr++; if (nonpr == 0) return str; if (high_water_alloc((void **)"ed_str, "ed_str_len, - nonpr * 3 + 1)) + (s - (unsigned char *)str) + nonpr * 3 + 1)) return NULL; for (s = (unsigned char *)str, q = quoted_str; *s != '\0'; s++) { - if (!isprint(*s) || isspace(*s) || *s == '\\') { + if (!isprint(*s) || isspace(*s) || *s == '\\' || *s == '=') { *q++ = '\\'; *q++ = '0' + ((*s >> 6) ); *q++ = '0' + ((*s >> 3) & 7); |