traceroute: fix help text to not show -6 when traceroute6 is off

[oweals/busybox.git] / libbb / read.c

diff --git a/libbb/read.c b/libbb/read.c
index 9f6bfcd1b815fa8f54bb923a17820deb41b786a8..06ce29718e9e5bb24219a01be9a67a2116074037 100644 (file)
--- a/libbb/read.c
+++ b/libbb/read.c
@@ -39,18 +39,18 @@ ssize_t FAST_FUNC safe_read(int fd, void *buf, size_t count)
  * *** BIG SURPRISE! It stays even after child exits! ***
  *
  * This is a design bug in UNIX API.
- *      fcntl(0, F_SETFL, fcntl(0, F_GETFL, 0) | O_NONBLOCK);
+ *      fcntl(0, F_SETFL, fcntl(0, F_GETFL) | O_NONBLOCK);
  * will set nonblocking mode not only on _your_ stdin, but
  * also on stdin of your parent, etc.
  *
  * In general,
  *      fd2 = dup(fd1);
- *      fcntl(fd2, F_SETFL, fcntl(fd2, F_GETFL, 0) | O_NONBLOCK);
+ *      fcntl(fd2, F_SETFL, fcntl(fd2, F_GETFL) | O_NONBLOCK);
  * sets both fd1 and fd2 to O_NONBLOCK. This includes cases
  * where duping is done implicitly by fork() etc.
  *
  * We need
- *      fcntl(fd2, F_SETFD, fcntl(fd2, F_GETFD, 0) | O_NONBLOCK);
+ *      fcntl(fd2, F_SETFD, fcntl(fd2, F_GETFD) | O_NONBLOCK);
  * (note SETFD, not SETFL!) but such thing doesn't exist.
  *
  * Alternatively, we need nonblocking_read(fd, ...) which doesn't
@@ -141,7 +141,7 @@ char* FAST_FUNC xmalloc_reads(int fd, char *buf, size_t *maxsz_p)
 {
        char *p;
        size_t sz = buf ? strlen(buf) : 0;
-       size_t maxsz = maxsz_p ? *maxsz_p : MAXINT(size_t);
+       size_t maxsz = maxsz_p ? *maxsz_p : (INT_MAX - 4095);
 
        goto jump_in;
        while (sz < maxsz) {
@@ -198,7 +198,7 @@ void* FAST_FUNC xmalloc_read(int fd, size_t *maxsz_p)
        size_t to_read;
        struct stat st;
 
-       to_read = maxsz_p ? *maxsz_p : MAXINT(ssize_t); /* max to read */
+       to_read = maxsz_p ? *maxsz_p : (INT_MAX - 4095); /* max to read */
 
        /* Estimate file size */
        st.st_size = 0; /* in case fstat fails, assume 0 */
@@ -229,7 +229,7 @@ void* FAST_FUNC xmalloc_read(int fd, size_t *maxsz_p)
                if (size > 64*1024)
                        size = 64*1024;
        }
-       xrealloc(buf, total + 1);
+       buf = xrealloc(buf, total + 1);
        buf[total] = '\0';
 
        if (maxsz_p)
@@ -262,7 +262,7 @@ void* FAST_FUNC xmalloc_open_read_close(const char *filename, size_t *maxsz_p)
        len = lseek(fd, 0, SEEK_END) | 0x3ff; /* + up to 1k */
        if (len != (off_t)-1) {
                xlseek(fd, 0, SEEK_SET);
-               size = maxsz_p ? *maxsz_p : INT_MAX;
+               size = maxsz_p ? *maxsz_p : (INT_MAX - 4095);
                if (len < size)
                        size = len;
        }
@@ -273,7 +273,7 @@ void* FAST_FUNC xmalloc_open_read_close(const char *filename, size_t *maxsz_p)
                free(buf);
                return NULL;
        }
-       xrealloc(buf, size + 1);
+       buf = xrealloc(buf, size + 1);
        buf[size] = '\0';
 
        if (maxsz_p)
@@ -315,7 +315,7 @@ int FAST_FUNC open_zipped(const char *fname)
        char *sfx;
        int fd;
 #if BB_MMU
-       USE_DESKTOP(long long) int FAST_FUNC (*xformer)(int src_fd, int dst_fd);
+       IF_DESKTOP(long long) int FAST_FUNC (*xformer)(int src_fd, int dst_fd);
        enum { xformer_prog = 0 };
 #else
        enum { xformer = 0 };
@@ -336,19 +336,23 @@ int FAST_FUNC open_zipped(const char *fname)
                 || (ENABLE_FEATURE_SEAMLESS_BZ2 && strcmp(sfx, ".bz2") == 0)
                ) {
                        /* .gz and .bz2 both have 2-byte signature, and their
-                        * unpack_XXX_stream want this header skipped. */
+                        * unpack_XXX_stream wants this header skipped. */
                        xread(fd, &magic, 2);
+#if ENABLE_FEATURE_SEAMLESS_GZ
 #if BB_MMU
                        xformer = unpack_gz_stream;
 #else
                        xformer_prog = "gunzip";
 #endif
-                       if (magic[0] != 0x1f || magic[1] != 0x8b) {
+#endif
+                       if (!ENABLE_FEATURE_SEAMLESS_GZ
+                        || magic[0] != 0x1f || magic[1] != 0x8b
+                       ) {
                                if (!ENABLE_FEATURE_SEAMLESS_BZ2
                                 || magic[0] != 'B' || magic[1] != 'Z'
                                ) {
                                        bb_error_msg_and_die("no gzip"
-                                               USE_FEATURE_SEAMLESS_BZ2("/bzip2")
+                                               IF_FEATURE_SEAMLESS_BZ2("/bzip2")
                                                " magic");
                                }
 #if BB_MMU