Replace some command name 'Tcpdump' with 'tcpdump'

[tcpdump] / tcpdump.c

diff --git a/tcpdump.c b/tcpdump.c
index 7731ea0e39a05d4d67b77b348c0278f9569ac48d..7159d1c76fd8677ea395f6e4321c58768f27721e 100644 (file)
--- a/tcpdump.c
+++ b/tcpdump.c
@@ -997,7 +997,7 @@ tstamp_precision_to_string(int precision)
  * that requires that it be able to do an F_GETFL fcntl() to read
  * the O_ flags.
  *
  * that requires that it be able to do an F_GETFL fcntl() to read
  * the O_ flags.
  *

- * Tcpdump uses ftell() to determine how much data has been written
+ * tcpdump uses ftell() to determine how much data has been written

  * to a file in order to, when used with -C, determine when it's time
  * to rotate capture files.  ftell() therefore needs to do an lseek()
  * to find out the file offset and must, thanks to the aforementioned
  * to a file in order to, when used with -C, determine when it's time
  * to rotate capture files.  ftell() therefore needs to do an lseek()
  * to find out the file offset and must, thanks to the aforementioned


@@ -1575,6 +1575,13 @@ main(int argc, char **argv)
        if (abort_on_misalignment(ebuf, sizeof(ebuf)) < 0)
                error("%s", ebuf);
 
        if (abort_on_misalignment(ebuf, sizeof(ebuf)) < 0)
                error("%s", ebuf);
 

+       /*
+        * An explicit tzset() call is usually not needed as it happens
+        * implicitly the first time we call localtime() or mktime(),
+        * but in some cases (sandboxing, chroot) this may be too late.
+        */
+       tzset();
+

        while (
            (op = getopt_long(argc, argv, SHORTOPTS, longopts, NULL)) != -1)
                switch (op) {
        while (
            (op = getopt_long(argc, argv, SHORTOPTS, longopts, NULL)) != -1)
                switch (op) {


@@ -1801,7 +1808,7 @@ main(int argc, char **argv)
                                if (nd_load_smi_module(optarg, ebuf, sizeof(ebuf)) == -1)
                                        error("%s", ebuf);
                        } else {
                                if (nd_load_smi_module(optarg, ebuf, sizeof(ebuf)) == -1)
                                        error("%s", ebuf);
                        } else {

-                               (void)fprintf(stderr, "%s: ignoring option `-m %s' ",
+                               (void)fprintf(stderr, "%s: ignoring option '-m %s' ",

                                              program_name, optarg);
                                (void)fprintf(stderr, "(no libsmi support)\n");
                        }
                                              program_name, optarg);
                                (void)fprintf(stderr, "(no libsmi support)\n");
                        }


@@ -1845,7 +1852,7 @@ main(int argc, char **argv)
                        else if (ascii_strcasecmp(optarg, "inout") == 0)
                                Qflag = PCAP_D_INOUT;
                        else
                        else if (ascii_strcasecmp(optarg, "inout") == 0)
                                Qflag = PCAP_D_INOUT;
                        else

-                               error("unknown capture direction `%s'", optarg);
+                               error("unknown capture direction '%s'", optarg);

                        break;
 #endif /* HAVE_PCAP_SETDIRECTION */
 
                        break;
 #endif /* HAVE_PCAP_SETDIRECTION */
 


@@ -1913,7 +1920,7 @@ main(int argc, char **argv)
                        else if (ascii_strcasecmp(optarg, "quic") == 0)
                                ndo->ndo_packettype = PT_QUIC;
                        else
                        else if (ascii_strcasecmp(optarg, "quic") == 0)
                                ndo->ndo_packettype = PT_QUIC;
                        else

-                               error("unknown packet type `%s'", optarg);
+                               error("unknown packet type '%s'", optarg);

                        break;
 
                case 'u':
                        break;
 
                case 'u':


@@ -2319,8 +2326,11 @@ main(int argc, char **argv)
                         * on; this may be a non-Linux "any" device
                         * that doesn't support DLT_LINUX_SLL2.
                         */
                         * on; this may be a non-Linux "any" device
                         * that doesn't support DLT_LINUX_SLL2.
                         */

-                       if (strcmp(device, "any") == 0)
+                       if (strcmp(device, "any") == 0) {
+DIAG_OFF_WARN_UNUSED_RESULT

                                (void) pcap_set_datalink(pd, DLT_LINUX_SLL2);
                                (void) pcap_set_datalink(pd, DLT_LINUX_SLL2);

+DIAG_ON_WARN_UNUSED_RESULT
+                       }

                }
 #endif
                i = pcap_snapshot(pd);
                }
 #endif
                i = pcap_snapshot(pd);


@@ -2387,7 +2397,7 @@ main(int argc, char **argv)
         * devices, and can't just give users that permission,
         * you'd make tcpdump set-UID or set-GID).
         *
         * devices, and can't just give users that permission,
         * you'd make tcpdump set-UID or set-GID).
         *

-        * Tcpdump doesn't necessarily write only to one savefile;
+        * tcpdump doesn't necessarily write only to one savefile;

         * the general only way to allow a -Z instance to write to
         * savefiles as the user under whose UID it's run, rather
         * than as the user specified with -Z, would thus be to switch
         * the general only way to allow a -Z instance to write to
         * savefiles as the user under whose UID it's run, rather
         * than as the user specified with -Z, would thus be to switch