Date: Wed, 26 Jun 2013 19:04:32 +0000 (UTC) From: Takuya ASADA <syuu@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r252258 - user/syuu/mq_bpf/contrib/tcpdump Message-ID: <201306261904.r5QJ4WCH029032@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: syuu Date: Wed Jun 26 19:04:32 2013 New Revision: 252258 URL: http://svnweb.freebsd.org/changeset/base/252258 Log: arg fix for tcpdump Modified: user/syuu/mq_bpf/contrib/tcpdump/tcpdump.c Modified: user/syuu/mq_bpf/contrib/tcpdump/tcpdump.c ============================================================================== --- user/syuu/mq_bpf/contrib/tcpdump/tcpdump.c Wed Jun 26 19:02:03 2013 (r252257) +++ user/syuu/mq_bpf/contrib/tcpdump/tcpdump.c Wed Jun 26 19:04:32 2013 (r252258) @@ -702,6 +702,7 @@ main(int argc, char **argv) #endif int status; FILE *VFile; + uint32_t rxq = (uint32_t)-1, txq = (uint32_t)-1, other = (uint32_t)-1; #ifdef WIN32 if(wsockinit() != 0) return 1; #endif /* WIN32 */ @@ -737,7 +738,7 @@ main(int argc, char **argv) #endif while ( - (op = getopt(argc, argv, "aAb" B_FLAG "c:C:d" D_FLAG "eE:fF:G:hHi:" I_FLAG j_FLAG J_FLAG "KlLm:M:nNOpqr:Rs:StT:u" U_FLAG "V:vw:W:xXy:Yz:Z:")) != -1) + (op = getopt(argc, argv, "aAb" B_FLAG "c:C:d" D_FLAG "eE:fF:G:hHi:" I_FLAG j_FLAG J_FLAG "KlLm:M:nNOpqr:Rs:StT:u" U_FLAG "V:vw:W:xXy:Yz:Z:Q:g:k")) != -1) switch (op) { case 'a': @@ -815,6 +816,10 @@ main(int argc, char **argv) infile = optarg; break; + case 'g': + txq = atoi(optarg); + break; + case 'G': Gflag = atoi(optarg); if (Gflag < 0) @@ -919,6 +924,12 @@ main(int argc, char **argv) #endif /* WIN32 */ break; + case 'k': + other = atoi(optarg); + if (other != 0 || other != 1) + usage(); + break; + case 'K': ++Kflag; break; @@ -965,6 +976,10 @@ main(int argc, char **argv) ++suppress_default_print; break; + case 'Q': + rxq = atoi(optarg); + break; + case 'r': RFileName = optarg; break; @@ -1101,20 +1116,6 @@ main(int argc, char **argv) } break; - case 'Q': - rxq = atoi(optarg); - break; - - case 'g': - txq = atoi(optarg); - break; - - case 'V': - other = atoi(optarg); - if (other != 0 || other != 1) - usage(); - break; - default: usage(); /* NOTREACHED */ @@ -2099,7 +2100,7 @@ usage(void) #endif /* WIN32 */ #endif /* HAVE_PCAP_LIB_VERSION */ (void)fprintf(stderr, -"Usage: %s [-aAbd" D_FLAG "efhH" I_FLAG J_FLAG "KlLnNOpqRStu" U_FLAG "vxX]" B_FLAG_USAGE " [ -c count ]\n", program_name); +"Usage: %s [-aAbd" D_FLAG "efghH" I_FLAG J_FLAG "kKlLnNOpqQRStu" U_FLAG "vxX]" B_FLAG_USAGE " [ -c count ]\n", program_name); (void)fprintf(stderr, "\t\t[ -C file_size ] [ -E algo:secret ] [ -F file ] [ -G seconds ]\n"); (void)fprintf(stderr,
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306261904.r5QJ4WCH029032>