Imported Upstream version 1.4.16+git20130910
This commit is contained in:
		
							parent
							
								
									e70fb8c051
								
							
						
					
					
						commit
						96678a79c9
					
				
					 28 changed files with 6224 additions and 3446 deletions
				
			
		| 
						 | 
				
			
			@ -1,4 +1,4 @@
 | 
			
		|||
# Makefile.in generated by automake 1.13.3 from Makefile.am.
 | 
			
		||||
# Makefile.in generated by automake 1.14 from Makefile.am.
 | 
			
		||||
# @configure_input@
 | 
			
		||||
 | 
			
		||||
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
 | 
			
		||||
| 
						 | 
				
			
			@ -497,6 +497,7 @@ DBILIBS = @DBILIBS@
 | 
			
		|||
DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
 | 
			
		||||
DEPDIR = @DEPDIR@
 | 
			
		||||
DEPLIBS = @DEPLIBS@
 | 
			
		||||
DLLTOOL = @DLLTOOL@
 | 
			
		||||
DSYMUTIL = @DSYMUTIL@
 | 
			
		||||
DUMPBIN = @DUMPBIN@
 | 
			
		||||
ECHO_C = @ECHO_C@
 | 
			
		||||
| 
						 | 
				
			
			@ -1204,6 +1205,7 @@ LTLIBOBJS = @LTLIBOBJS@
 | 
			
		|||
LTLIBPTH = @LTLIBPTH@
 | 
			
		||||
LTLIBTHREAD = @LTLIBTHREAD@
 | 
			
		||||
MAKEINFO = @MAKEINFO@
 | 
			
		||||
MANIFEST_TOOL = @MANIFEST_TOOL@
 | 
			
		||||
MATHLIBS = @MATHLIBS@
 | 
			
		||||
MKDIR_P = @MKDIR_P@
 | 
			
		||||
MSGFMT = @MSGFMT@
 | 
			
		||||
| 
						 | 
				
			
			@ -1529,6 +1531,7 @@ abs_builddir = @abs_builddir@
 | 
			
		|||
abs_srcdir = @abs_srcdir@
 | 
			
		||||
abs_top_builddir = @abs_top_builddir@
 | 
			
		||||
abs_top_srcdir = @abs_top_srcdir@
 | 
			
		||||
ac_ct_AR = @ac_ct_AR@
 | 
			
		||||
ac_ct_CC = @ac_ct_CC@
 | 
			
		||||
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 | 
			
		||||
am__include = @am__include@
 | 
			
		||||
| 
						 | 
				
			
			@ -1568,7 +1571,6 @@ libexecdir = @libexecdir@
 | 
			
		|||
lispdir = @lispdir@
 | 
			
		||||
localedir = $(datadir)/locale
 | 
			
		||||
localstatedir = @localstatedir@
 | 
			
		||||
lt_ECHO = @lt_ECHO@
 | 
			
		||||
mandir = @mandir@
 | 
			
		||||
mkdir_p = @mkdir_p@
 | 
			
		||||
np_mysql_config = @np_mysql_config@
 | 
			
		||||
| 
						 | 
				
			
			@ -1695,14 +1697,14 @@ distclean-compile:
 | 
			
		|||
@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 | 
			
		||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 | 
			
		||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 | 
			
		||||
@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
 | 
			
		||||
@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 | 
			
		||||
 | 
			
		||||
.c.obj:
 | 
			
		||||
@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 | 
			
		||||
@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 | 
			
		||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 | 
			
		||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 | 
			
		||||
@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
 | 
			
		||||
@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 | 
			
		||||
 | 
			
		||||
.c.lo:
 | 
			
		||||
@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -454,6 +454,14 @@ main(int argc, char **argv)
 | 
			
		|||
	/* Parse extra opts if any */
 | 
			
		||||
	argv=np_extra_opts(&argc, argv, progname);
 | 
			
		||||
 | 
			
		||||
	/* support "--help" and "--version" */
 | 
			
		||||
	if(argc == 2) {
 | 
			
		||||
		if(!strcmp(argv[1], "--help"))
 | 
			
		||||
			strcpy(argv[1], "-h");
 | 
			
		||||
		if(!strcmp(argv[1], "--version"))
 | 
			
		||||
			strcpy(argv[1], "-V");
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	/* parse the arguments */
 | 
			
		||||
	for(i = 1; i < argc; i++) {
 | 
			
		||||
		while((arg = getopt(argc, argv, "vhVw:c:n:p:t:H:s:i:b:I:l:m:")) != EOF) {
 | 
			
		||||
| 
						 | 
				
			
			@ -472,7 +480,6 @@ main(int argc, char **argv)
 | 
			
		|||
					usage_va("ICMP data length must be between: %d and %d",
 | 
			
		||||
					         sizeof(struct icmp) + sizeof(struct icmp_ping_data),
 | 
			
		||||
					         MAX_PING_DATA - 1);
 | 
			
		||||
 | 
			
		||||
				break;
 | 
			
		||||
			case 'i':
 | 
			
		||||
				pkt_interval = get_timevar(optarg);
 | 
			
		||||
| 
						 | 
				
			
			@ -512,12 +519,12 @@ main(int argc, char **argv)
 | 
			
		|||
			case 's': /* specify source IP address */
 | 
			
		||||
				set_source_ip(optarg);
 | 
			
		||||
				break;
 | 
			
		||||
      case 'V':                 /* version */
 | 
			
		||||
        print_revision (progname, NP_VERSION);
 | 
			
		||||
        exit (STATE_OK);
 | 
			
		||||
      case 'h':                 /* help */
 | 
			
		||||
        print_help ();
 | 
			
		||||
        exit (STATE_OK);
 | 
			
		||||
			case 'V': /* version */
 | 
			
		||||
				print_revision (progname, NP_VERSION);
 | 
			
		||||
				exit (STATE_OK);
 | 
			
		||||
			case 'h': /* help */
 | 
			
		||||
				print_help ();
 | 
			
		||||
				exit (STATE_OK);
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue