Browse Source

Memory Management Error fixes

MissValeska 10 years ago
parent
commit
4a097a27f1
10 changed files with 1726 additions and 1125 deletions
  1. 387
    234
      src/Makefile.in
  2. 297
    297
      src/andna.c
  3. 21
    21
      src/andns_lib.c
  4. 214
    71
      src/conf/Makefile.in
  5. 3
    0
      src/config.h.in
  6. 179
    178
      src/gmap.c
  7. 89
    89
      src/inet.c
  8. 2
    0
      src/libiptc/libiptc.c
  9. 274
    143
      src/man/Makefile.in
  10. 260
    92
      src/scripts/Makefile.in

+ 387
- 234
src/Makefile.in View File

@@ -1,8 +1,8 @@
1
-# Makefile.in generated by automake 1.8.5 from Makefile.am.
1
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5
-# 2003, 2004  Free Software Foundation, Inc.
4
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
5
+
6 6
 # This Makefile.in is free software; the Free Software Foundation
7 7
 # gives unlimited permission to copy and/or distribute it,
8 8
 # with or without modifications, as long as this notice is preserved.
@@ -14,17 +14,57 @@
14 14
 
15 15
 @SET_MAKE@
16 16
 
17
-SOURCES = $(ntk_resolv_SOURCES) $(ntkd_SOURCES)
18
-
19
-srcdir = @srcdir@
20
-top_srcdir = @top_srcdir@
21 17
 VPATH = @srcdir@
18
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
19
+am__make_running_with_option = \
20
+  case $${target_option-} in \
21
+      ?) ;; \
22
+      *) echo "am__make_running_with_option: internal error: invalid" \
23
+              "target option '$${target_option-}' specified" >&2; \
24
+         exit 1;; \
25
+  esac; \
26
+  has_opt=no; \
27
+  sane_makeflags=$$MAKEFLAGS; \
28
+  if $(am__is_gnu_make); then \
29
+    sane_makeflags=$$MFLAGS; \
30
+  else \
31
+    case $$MAKEFLAGS in \
32
+      *\\[\ \	]*) \
33
+        bs=\\; \
34
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
35
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
36
+    esac; \
37
+  fi; \
38
+  skip_next=no; \
39
+  strip_trailopt () \
40
+  { \
41
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
42
+  }; \
43
+  for flg in $$sane_makeflags; do \
44
+    test $$skip_next = yes && { skip_next=no; continue; }; \
45
+    case $$flg in \
46
+      *=*|--*) continue;; \
47
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
48
+      -*I?*) strip_trailopt 'I';; \
49
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
50
+      -*O?*) strip_trailopt 'O';; \
51
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
52
+      -*l?*) strip_trailopt 'l';; \
53
+      -[dEDm]) skip_next=yes;; \
54
+      -[JT]) skip_next=yes;; \
55
+    esac; \
56
+    case $$flg in \
57
+      *$$target_option*) has_opt=yes; break;; \
58
+    esac; \
59
+  done; \
60
+  test $$has_opt = yes
61
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
62
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
22 63
 pkgdatadir = $(datadir)/@PACKAGE@
23
-pkglibdir = $(libdir)/@PACKAGE@
24 64
 pkgincludedir = $(includedir)/@PACKAGE@
25
-top_builddir = ..
65
+pkglibdir = $(libdir)/@PACKAGE@
66
+pkglibexecdir = $(libexecdir)/@PACKAGE@
26 67
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
27
-INSTALL = @INSTALL@
28 68
 install_sh_DATA = $(install_sh) -c -m 644
29 69
 install_sh_PROGRAM = $(install_sh) -c
30 70
 install_sh_SCRIPT = $(install_sh) -c
@@ -36,20 +76,21 @@ POST_INSTALL = :
36 76
 NORMAL_UNINSTALL = :
37 77
 PRE_UNINSTALL = :
38 78
 POST_UNINSTALL = :
79
+build_triplet = @build@
39 80
 host_triplet = @host@
40 81
 bin_PROGRAMS = ntkd$(EXEEXT) ntk-resolv$(EXEEXT)
41 82
 subdir = src
42
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
43
-	$(srcdir)/config.h.in TODO
83
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
84
+	$(srcdir)/config.h.in $(top_srcdir)/depcomp TODO
44 85
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
45 86
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
46 87
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
47 88
 	$(ACLOCAL_M4)
48
-mkinstalldirs = $(mkdir_p)
89
+mkinstalldirs = $(install_sh) -d
49 90
 CONFIG_HEADER = config.h
50 91
 CONFIG_CLEAN_FILES =
92
+CONFIG_CLEAN_VPATH_FILES =
51 93
 am__installdirs = "$(DESTDIR)$(bindir)"
52
-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
53 94
 PROGRAMS = $(bin_PROGRAMS)
54 95
 am_ntk_resolv_OBJECTS = andns_lib.$(OBJEXT) ntkresolv.$(OBJEXT) \
55 96
 	andns_net.$(OBJEXT) crypto.$(OBJEXT) snsd_cache.$(OBJEXT) \
@@ -74,52 +115,111 @@ am_ntkd_OBJECTS = accept.$(OBJEXT) map.$(OBJEXT) misc.$(OBJEXT) \
74 115
 	netsukuku.$(OBJEXT) mark.$(OBJEXT) libip4tc.$(OBJEXT)
75 116
 ntkd_OBJECTS = $(am_ntkd_OBJECTS)
76 117
 ntkd_DEPENDENCIES =
77
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
118
+AM_V_P = $(am__v_P_@AM_V@)
119
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
120
+am__v_P_0 = false
121
+am__v_P_1 = :
122
+AM_V_GEN = $(am__v_GEN_@AM_V@)
123
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
124
+am__v_GEN_0 = @echo "  GEN     " $@;
125
+am__v_GEN_1 = 
126
+AM_V_at = $(am__v_at_@AM_V@)
127
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
128
+am__v_at_0 = @
129
+am__v_at_1 = 
130
+DEFAULT_INCLUDES = -I.@am__isrc@
78 131
 depcomp = $(SHELL) $(top_srcdir)/depcomp
79 132
 am__depfiles_maybe = depfiles
80
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/accept.Po ./$(DEPDIR)/andna.Po \
81
-@AMDEP_TRUE@	./$(DEPDIR)/andna_cache.Po ./$(DEPDIR)/andns.Po \
82
-@AMDEP_TRUE@	./$(DEPDIR)/andns_lib.Po ./$(DEPDIR)/andns_net.Po \
83
-@AMDEP_TRUE@	./$(DEPDIR)/andns_snsd.Po ./$(DEPDIR)/bmap.Po \
84
-@AMDEP_TRUE@	./$(DEPDIR)/buffer.Po ./$(DEPDIR)/conf.Po \
85
-@AMDEP_TRUE@	./$(DEPDIR)/crypto.Po ./$(DEPDIR)/daemon.Po \
86
-@AMDEP_TRUE@	./$(DEPDIR)/dns_wrapper.Po ./$(DEPDIR)/dnslib.Po \
87
-@AMDEP_TRUE@	./$(DEPDIR)/endianness.Po ./$(DEPDIR)/err_errno.Po \
88
-@AMDEP_TRUE@	./$(DEPDIR)/gmap.Po ./$(DEPDIR)/hash.Po \
89
-@AMDEP_TRUE@	./$(DEPDIR)/hook.Po ./$(DEPDIR)/if.Po \
90
-@AMDEP_TRUE@	./$(DEPDIR)/igs.Po ./$(DEPDIR)/inet.Po \
91
-@AMDEP_TRUE@	./$(DEPDIR)/iptunnel.Po ./$(DEPDIR)/ipv6-gmp.Po \
92
-@AMDEP_TRUE@	./$(DEPDIR)/krnl_route.Po ./$(DEPDIR)/krnl_rule.Po \
93
-@AMDEP_TRUE@	./$(DEPDIR)/libip4tc.Po ./$(DEPDIR)/libnetlink.Po \
94
-@AMDEP_TRUE@	./$(DEPDIR)/libping.Po ./$(DEPDIR)/ll_map.Po \
95
-@AMDEP_TRUE@	./$(DEPDIR)/llist.Po ./$(DEPDIR)/log.Po \
96
-@AMDEP_TRUE@	./$(DEPDIR)/map.Po ./$(DEPDIR)/mark.Po \
97
-@AMDEP_TRUE@	./$(DEPDIR)/misc.Po ./$(DEPDIR)/netsukuku.Po \
98
-@AMDEP_TRUE@	./$(DEPDIR)/ntkresolv.Po ./$(DEPDIR)/pkts.Po \
99
-@AMDEP_TRUE@	./$(DEPDIR)/qspn.Po ./$(DEPDIR)/radar.Po \
100
-@AMDEP_TRUE@	./$(DEPDIR)/rehook.Po ./$(DEPDIR)/request.Po \
101
-@AMDEP_TRUE@	./$(DEPDIR)/route.Po ./$(DEPDIR)/snsd_cache.Po \
102
-@AMDEP_TRUE@	./$(DEPDIR)/tracer.Po ./$(DEPDIR)/xmalloc.Po
133
+am__mv = mv -f
134
+AM_V_lt = $(am__v_lt_@AM_V@)
135
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
136
+am__v_lt_0 = --silent
137
+am__v_lt_1 = 
103 138
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
104 139
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
140
+AM_V_CC = $(am__v_CC_@AM_V@)
141
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
142
+am__v_CC_0 = @echo "  CC      " $@;
143
+am__v_CC_1 = 
105 144
 CCLD = $(CC)
106 145
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
146
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
147
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
148
+am__v_CCLD_0 = @echo "  CCLD    " $@;
149
+am__v_CCLD_1 = 
107 150
 SOURCES = $(ntk_resolv_SOURCES) $(ntkd_SOURCES)
108 151
 DIST_SOURCES = $(ntk_resolv_SOURCES) $(ntkd_SOURCES)
109
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
110
-	html-recursive info-recursive install-data-recursive \
111
-	install-exec-recursive install-info-recursive \
112
-	install-recursive installcheck-recursive installdirs-recursive \
113
-	pdf-recursive ps-recursive uninstall-info-recursive \
114
-	uninstall-recursive
152
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
153
+	ctags-recursive dvi-recursive html-recursive info-recursive \
154
+	install-data-recursive install-dvi-recursive \
155
+	install-exec-recursive install-html-recursive \
156
+	install-info-recursive install-pdf-recursive \
157
+	install-ps-recursive install-recursive installcheck-recursive \
158
+	installdirs-recursive pdf-recursive ps-recursive \
159
+	tags-recursive uninstall-recursive
160
+am__can_run_installinfo = \
161
+  case $$AM_UPDATE_INFO_DIR in \
162
+    n|no|NO) false;; \
163
+    *) (install-info --version) >/dev/null 2>&1;; \
164
+  esac
165
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
166
+  distclean-recursive maintainer-clean-recursive
167
+am__recursive_targets = \
168
+  $(RECURSIVE_TARGETS) \
169
+  $(RECURSIVE_CLEAN_TARGETS) \
170
+  $(am__extra_recursive_targets)
171
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
172
+	distdir
173
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
174
+	$(LISP)config.h.in
175
+# Read a list of newline-separated strings from the standard input,
176
+# and print each of them once, without duplicates.  Input order is
177
+# *not* preserved.
178
+am__uniquify_input = $(AWK) '\
179
+  BEGIN { nonempty = 0; } \
180
+  { items[$$0] = 1; nonempty = 1; } \
181
+  END { if (nonempty) { for (i in items) print i; }; } \
182
+'
183
+# Make sure the list of sources is unique.  This is necessary because,
184
+# e.g., the same source file might be shared among _SOURCES variables
185
+# for different programs/libraries.
186
+am__define_uniq_tagged_files = \
187
+  list='$(am__tagged_files)'; \
188
+  unique=`for i in $$list; do \
189
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
190
+  done | $(am__uniquify_input)`
115 191
 ETAGS = etags
116 192
 CTAGS = ctags
117 193
 DIST_SUBDIRS = $(SUBDIRS)
118 194
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
195
+am__relativize = \
196
+  dir0=`pwd`; \
197
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
198
+  sed_rest='s,^[^/]*/*,,'; \
199
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
200
+  sed_butlast='s,/*[^/]*$$,,'; \
201
+  while test -n "$$dir1"; do \
202
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
203
+    if test "$$first" != "."; then \
204
+      if test "$$first" = ".."; then \
205
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
206
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
207
+      else \
208
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
209
+        if test "$$first2" = "$$first"; then \
210
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
211
+        else \
212
+          dir2="../$$dir2"; \
213
+        fi; \
214
+        dir0="$$dir0"/"$$first"; \
215
+      fi; \
216
+    fi; \
217
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
218
+  done; \
219
+  reldir="$$dir2"
119 220
 ACLOCAL = @ACLOCAL@
120
-AMDEP_FALSE = @AMDEP_FALSE@
121
-AMDEP_TRUE = @AMDEP_TRUE@
122 221
 AMTAR = @AMTAR@
222
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
123 223
 AUTOCONF = @AUTOCONF@
124 224
 AUTOHEADER = @AUTOHEADER@
125 225
 AUTOMAKE = @AUTOMAKE@
@@ -142,7 +242,9 @@ ECHO_N = @ECHO_N@
142 242
 ECHO_T = @ECHO_T@
143 243
 EGREP = @EGREP@
144 244
 EXEEXT = @EXEEXT@
245
+GREP = @GREP@
145 246
 IF_METHOD = @IF_METHOD@
247
+INSTALL = @INSTALL@
146 248
 INSTALL_DATA = @INSTALL_DATA@
147 249
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
148 250
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -153,6 +255,7 @@ LIBOBJS = @LIBOBJS@
153 255
 LIBS = @LIBS@
154 256
 LTLIBOBJS = @LTLIBOBJS@
155 257
 MAKEINFO = @MAKEINFO@
258
+MKDIR_P = @MKDIR_P@
156 259
 OBJEXT = @OBJEXT@
157 260
 OTHER_METHOD = @OTHER_METHOD@
158 261
 PACKAGE = @PACKAGE@
@@ -160,6 +263,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
160 263
 PACKAGE_NAME = @PACKAGE_NAME@
161 264
 PACKAGE_STRING = @PACKAGE_STRING@
162 265
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
266
+PACKAGE_URL = @PACKAGE_URL@
163 267
 PACKAGE_VERSION = @PACKAGE_VERSION@
164 268
 PATH_SEPARATOR = @PATH_SEPARATOR@
165 269
 PID_DIR = @PID_DIR@
@@ -168,24 +272,29 @@ SET_MAKE = @SET_MAKE@
168 272
 SHELL = @SHELL@
169 273
 STRIP = @STRIP@
170 274
 VERSION = @VERSION@
275
+abs_builddir = @abs_builddir@
276
+abs_srcdir = @abs_srcdir@
277
+abs_top_builddir = @abs_top_builddir@
278
+abs_top_srcdir = @abs_top_srcdir@
171 279
 ac_ct_CC = @ac_ct_CC@
172 280
 ac_ct_CXX = @ac_ct_CXX@
173
-ac_ct_STRIP = @ac_ct_STRIP@
174
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
175
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
176
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
177
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
178 281
 am__include = @am__include@
179 282
 am__leading_dot = @am__leading_dot@
180 283
 am__quote = @am__quote@
284
+am__tar = @am__tar@
285
+am__untar = @am__untar@
181 286
 bindir = @bindir@
182 287
 build = @build@
183 288
 build_alias = @build_alias@
184 289
 build_cpu = @build_cpu@
185 290
 build_os = @build_os@
186 291
 build_vendor = @build_vendor@
292
+builddir = @builddir@
187 293
 datadir = @datadir@
294
+datarootdir = @datarootdir@
188 295
 debug_flags = @debug_flags@
296
+docdir = @docdir@
297
+dvidir = @dvidir@
189 298
 exec_prefix = @exec_prefix@
190 299
 gmp = @gmp@
191 300
 host = @host@
@@ -193,21 +302,29 @@ host_alias = @host_alias@
193 302
 host_cpu = @host_cpu@
194 303
 host_os = @host_os@
195 304
 host_vendor = @host_vendor@
305
+htmldir = @htmldir@
196 306
 includedir = @includedir@
197 307
 infodir = @infodir@
198 308
 install_sh = @install_sh@
199 309
 libdir = @libdir@
200 310
 libexecdir = @libexecdir@
311
+localedir = @localedir@
201 312
 localstatedir = @localstatedir@
202 313
 mandir = @mandir@
203 314
 mkdir_p = @mkdir_p@
204 315
 oldincludedir = @oldincludedir@
316
+pdfdir = @pdfdir@
205 317
 prefix = @prefix@
206 318
 program_transform_name = @program_transform_name@
319
+psdir = @psdir@
207 320
 sbindir = @sbindir@
208 321
 sharedstatedir = @sharedstatedir@
322
+srcdir = @srcdir@
209 323
 sysconfdir = @sysconfdir@
210 324
 target_alias = @target_alias@
325
+top_build_prefix = @top_build_prefix@
326
+top_builddir = @top_builddir@
327
+top_srcdir = @top_srcdir@
211 328
 SUBDIRS = man scripts conf
212 329
 AM_CFLAGS = -g -I. @debug_flags@ -I@gmp@
213 330
 AM_CXXFLAGS = -g -I. @debug_flags@ -I@gmp@
@@ -236,14 +353,14 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
236 353
 	@for dep in $?; do \
237 354
 	  case '$(am__configure_deps)' in \
238 355
 	    *$$dep*) \
239
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
240
-		&& exit 0; \
356
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
357
+	        && { if test -f $@; then exit 0; else break; fi; }; \
241 358
 	      exit 1;; \
242 359
 	  esac; \
243 360
 	done; \
244
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/Makefile'; \
245
-	cd $(top_srcdir) && \
246
-	  $(AUTOMAKE) --gnu  src/Makefile
361
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \
362
+	$(am__cd) $(top_srcdir) && \
363
+	  $(AUTOMAKE) --gnu src/Makefile
247 364
 .PRECIOUS: Makefile
248 365
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
249 366
 	@case '$?' in \
@@ -261,18 +378,17 @@ $(top_srcdir)/configure:  $(am__configure_deps)
261 378
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
262 379
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
263 380
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
381
+$(am__aclocal_m4_deps):
264 382
 
265 383
 config.h: stamp-h1
266
-	@if test ! -f $@; then \
267
-	  rm -f stamp-h1; \
268
-	  $(MAKE) stamp-h1; \
269
-	else :; fi
384
+	@if test ! -f $@; then rm -f stamp-h1; else :; fi
385
+	@if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
270 386
 
271 387
 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
272 388
 	@rm -f stamp-h1
273 389
 	cd $(top_builddir) && $(SHELL) ./config.status src/config.h
274 390
 $(srcdir)/config.h.in:  $(am__configure_deps) 
275
-	cd $(top_srcdir) && $(AUTOHEADER)
391
+	($(am__cd) $(top_srcdir) && $(AUTOHEADER))
276 392
 	rm -f stamp-h1
277 393
 	touch $@
278 394
 
@@ -280,33 +396,54 @@ distclean-hdr:
280 396
 	-rm -f config.h stamp-h1
281 397
 install-binPROGRAMS: $(bin_PROGRAMS)
282 398
 	@$(NORMAL_INSTALL)
283
-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
284
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
285
-	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
286
-	  if test -f $$p \
287
-	  ; then \
288
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
289
-	   echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
290
-	   $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
291
-	  else :; fi; \
292
-	done
399
+	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
400
+	if test -n "$$list"; then \
401
+	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
402
+	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
403
+	fi; \
404
+	for p in $$list; do echo "$$p $$p"; done | \
405
+	sed 's/$(EXEEXT)$$//' | \
406
+	while read p p1; do if test -f $$p \
407
+	  ; then echo "$$p"; echo "$$p"; else :; fi; \
408
+	done | \
409
+	sed -e 'p;s,.*/,,;n;h' \
410
+	    -e 's|.*|.|' \
411
+	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
412
+	sed 'N;N;N;s,\n, ,g' | \
413
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
414
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
415
+	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
416
+	    else { print "f", $$3 "/" $$4, $$1; } } \
417
+	  END { for (d in files) print "f", d, files[d] }' | \
418
+	while read type dir files; do \
419
+	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
420
+	    test -z "$$files" || { \
421
+	      echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
422
+	      $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
423
+	    } \
424
+	; done
293 425
 
294 426
 uninstall-binPROGRAMS:
295 427
 	@$(NORMAL_UNINSTALL)
296
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
297
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
298
-	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
299
-	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
300
-	done
428
+	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
429
+	files=`for p in $$list; do echo "$$p"; done | \
430
+	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
431
+	      -e 's/$$/$(EXEEXT)/' \
432
+	`; \
433
+	test -n "$$list" || exit 0; \
434
+	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
435
+	cd "$(DESTDIR)$(bindir)" && rm -f $$files
301 436
 
302 437
 clean-binPROGRAMS:
303 438
 	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
304
-ntk-resolv$(EXEEXT): $(ntk_resolv_OBJECTS) $(ntk_resolv_DEPENDENCIES) 
439
+
440
+ntk-resolv$(EXEEXT): $(ntk_resolv_OBJECTS) $(ntk_resolv_DEPENDENCIES) $(EXTRA_ntk_resolv_DEPENDENCIES) 
305 441
 	@rm -f ntk-resolv$(EXEEXT)
306
-	$(LINK) $(ntk_resolv_LDFLAGS) $(ntk_resolv_OBJECTS) $(ntk_resolv_LDADD) $(LIBS)
307
-ntkd$(EXEEXT): $(ntkd_OBJECTS) $(ntkd_DEPENDENCIES) 
442
+	$(AM_V_CCLD)$(LINK) $(ntk_resolv_OBJECTS) $(ntk_resolv_LDADD) $(LIBS)
443
+
444
+ntkd$(EXEEXT): $(ntkd_OBJECTS) $(ntkd_DEPENDENCIES) $(EXTRA_ntkd_DEPENDENCIES) 
308 445
 	@rm -f ntkd$(EXEEXT)
309
-	$(LINK) $(ntkd_LDFLAGS) $(ntkd_OBJECTS) $(ntkd_LDADD) $(LIBS)
446
+	$(AM_V_CCLD)$(LINK) $(ntkd_OBJECTS) $(ntkd_LDADD) $(LIBS)
310 447
 
311 448
 mostlyclean-compile:
312 449
 	-rm -f *.$(OBJEXT)
@@ -362,49 +499,53 @@ distclean-compile:
362 499
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmalloc.Po@am__quote@
363 500
 
364 501
 .c.o:
365
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
366
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
367
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
368
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
369
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
370
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
502
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
503
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
504
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
505
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
506
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
371 507
 
372 508
 .c.obj:
373
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
374
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
375
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
376
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
377
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
378
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
509
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
510
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
511
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
512
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
513
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
379 514
 
380 515
 libip4tc.o: libiptc/libip4tc.c
381
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libip4tc.o -MD -MP -MF "$(DEPDIR)/libip4tc.Tpo" -c -o libip4tc.o `test -f 'libiptc/libip4tc.c' || echo '$(srcdir)/'`libiptc/libip4tc.c; \
382
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libip4tc.Tpo" "$(DEPDIR)/libip4tc.Po"; else rm -f "$(DEPDIR)/libip4tc.Tpo"; exit 1; fi
383
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libiptc/libip4tc.c' object='libip4tc.o' libtool=no @AMDEPBACKSLASH@
384
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libip4tc.Po' tmpdepfile='$(DEPDIR)/libip4tc.TPo' @AMDEPBACKSLASH@
385
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
386
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libip4tc.o `test -f 'libiptc/libip4tc.c' || echo '$(srcdir)/'`libiptc/libip4tc.c
516
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libip4tc.o -MD -MP -MF $(DEPDIR)/libip4tc.Tpo -c -o libip4tc.o `test -f 'libiptc/libip4tc.c' || echo '$(srcdir)/'`libiptc/libip4tc.c
517
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libip4tc.Tpo $(DEPDIR)/libip4tc.Po
518
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libiptc/libip4tc.c' object='libip4tc.o' libtool=no @AMDEPBACKSLASH@
519
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
520
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libip4tc.o `test -f 'libiptc/libip4tc.c' || echo '$(srcdir)/'`libiptc/libip4tc.c
387 521
 
388 522
 libip4tc.obj: libiptc/libip4tc.c
389
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libip4tc.obj -MD -MP -MF "$(DEPDIR)/libip4tc.Tpo" -c -o libip4tc.obj `if test -f 'libiptc/libip4tc.c'; then $(CYGPATH_W) 'libiptc/libip4tc.c'; else $(CYGPATH_W) '$(srcdir)/libiptc/libip4tc.c'; fi`; \
390
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libip4tc.Tpo" "$(DEPDIR)/libip4tc.Po"; else rm -f "$(DEPDIR)/libip4tc.Tpo"; exit 1; fi
391
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libiptc/libip4tc.c' object='libip4tc.obj' libtool=no @AMDEPBACKSLASH@
392
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libip4tc.Po' tmpdepfile='$(DEPDIR)/libip4tc.TPo' @AMDEPBACKSLASH@
393
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
394
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libip4tc.obj `if test -f 'libiptc/libip4tc.c'; then $(CYGPATH_W) 'libiptc/libip4tc.c'; else $(CYGPATH_W) '$(srcdir)/libiptc/libip4tc.c'; fi`
395
-uninstall-info-am:
523
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libip4tc.obj -MD -MP -MF $(DEPDIR)/libip4tc.Tpo -c -o libip4tc.obj `if test -f 'libiptc/libip4tc.c'; then $(CYGPATH_W) 'libiptc/libip4tc.c'; else $(CYGPATH_W) '$(srcdir)/libiptc/libip4tc.c'; fi`
524
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libip4tc.Tpo $(DEPDIR)/libip4tc.Po
525
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libiptc/libip4tc.c' object='libip4tc.obj' libtool=no @AMDEPBACKSLASH@
526
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
527
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libip4tc.obj `if test -f 'libiptc/libip4tc.c'; then $(CYGPATH_W) 'libiptc/libip4tc.c'; else $(CYGPATH_W) '$(srcdir)/libiptc/libip4tc.c'; fi`
396 528
 
397 529
 # This directory's subdirectories are mostly independent; you can cd
398
-# into them and run `make' without going through this Makefile.
399
-# To change the values of `make' variables: instead of editing Makefiles,
400
-# (1) if the variable is set in `config.status', edit `config.status'
401
-#     (which will cause the Makefiles to be regenerated when you run `make');
402
-# (2) otherwise, pass the desired values on the `make' command line.
403
-$(RECURSIVE_TARGETS):
404
-	@set fnord $$MAKEFLAGS; amf=$$2; \
530
+# into them and run 'make' without going through this Makefile.
531
+# To change the values of 'make' variables: instead of editing Makefiles,
532
+# (1) if the variable is set in 'config.status', edit 'config.status'
533
+#     (which will cause the Makefiles to be regenerated when you run 'make');
534
+# (2) otherwise, pass the desired values on the 'make' command line.
535
+$(am__recursive_targets):
536
+	@fail=; \
537
+	if $(am__make_keepgoing); then \
538
+	  failcom='fail=yes'; \
539
+	else \
540
+	  failcom='exit 1'; \
541
+	fi; \
405 542
 	dot_seen=no; \
406 543
 	target=`echo $@ | sed s/-recursive//`; \
407
-	list='$(SUBDIRS)'; for subdir in $$list; do \
544
+	case "$@" in \
545
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
546
+	  *) list='$(SUBDIRS)' ;; \
547
+	esac; \
548
+	for subdir in $$list; do \
408 549
 	  echo "Making $$target in $$subdir"; \
409 550
 	  if test "$$subdir" = "."; then \
410 551
 	    dot_seen=yes; \
@@ -412,60 +553,20 @@ $(RECURSIVE_TARGETS):
412 553
 	  else \
413 554
 	    local_target="$$target"; \
414 555
 	  fi; \
415
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
416
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
556
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
557
+	  || eval $$failcom; \
417 558
 	done; \
418 559
 	if test "$$dot_seen" = "no"; then \
419 560
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
420 561
 	fi; test -z "$$fail"
421 562
 
422
-mostlyclean-recursive clean-recursive distclean-recursive \
423
-maintainer-clean-recursive:
424
-	@set fnord $$MAKEFLAGS; amf=$$2; \
425
-	dot_seen=no; \
426
-	case "$@" in \
427
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
428
-	  *) list='$(SUBDIRS)' ;; \
429
-	esac; \
430
-	rev=''; for subdir in $$list; do \
431
-	  if test "$$subdir" = "."; then :; else \
432
-	    rev="$$subdir $$rev"; \
433
-	  fi; \
434
-	done; \
435
-	rev="$$rev ."; \
436
-	target=`echo $@ | sed s/-recursive//`; \
437
-	for subdir in $$rev; do \
438
-	  echo "Making $$target in $$subdir"; \
439
-	  if test "$$subdir" = "."; then \
440
-	    local_target="$$target-am"; \
441
-	  else \
442
-	    local_target="$$target"; \
443
-	  fi; \
444
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
445
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
446
-	done && test -z "$$fail"
447
-tags-recursive:
448
-	list='$(SUBDIRS)'; for subdir in $$list; do \
449
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
450
-	done
451
-ctags-recursive:
452
-	list='$(SUBDIRS)'; for subdir in $$list; do \
453
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
454
-	done
563
+ID: $(am__tagged_files)
564
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
565
+tags: tags-recursive
566
+TAGS: tags
455 567
 
456
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
457
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
458
-	unique=`for i in $$list; do \
459
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
460
-	  done | \
461
-	  $(AWK) '    { files[$$0] = 1; } \
462
-	       END { for (i in files) print i; }'`; \
463
-	mkid -fID $$unique
464
-tags: TAGS
465
-
466
-TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
467
-		$(TAGS_FILES) $(LISP)
468
-	tags=; \
568
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
569
+	set x; \
469 570
 	here=`pwd`; \
470 571
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
471 572
 	  include_option=--etags-include; \
@@ -477,79 +578,104 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
477 578
 	list='$(SUBDIRS)'; for subdir in $$list; do \
478 579
 	  if test "$$subdir" = .; then :; else \
479 580
 	    test ! -f $$subdir/TAGS || \
480
-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
581
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
481 582
 	  fi; \
482 583
 	done; \
483
-	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
484
-	unique=`for i in $$list; do \
485
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
486
-	  done | \
487
-	  $(AWK) '    { files[$$0] = 1; } \
488
-	       END { for (i in files) print i; }'`; \
489
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
584
+	$(am__define_uniq_tagged_files); \
585
+	shift; \
586
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
490 587
 	  test -n "$$unique" || unique=$$empty_fix; \
491
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
492
-	    $$tags $$unique; \
588
+	  if test $$# -gt 0; then \
589
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
590
+	      "$$@" $$unique; \
591
+	  else \
592
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
593
+	      $$unique; \
594
+	  fi; \
493 595
 	fi
494
-ctags: CTAGS
495
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
496
-		$(TAGS_FILES) $(LISP)
497
-	tags=; \
498
-	here=`pwd`; \
499
-	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
500
-	unique=`for i in $$list; do \
501
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
502
-	  done | \
503
-	  $(AWK) '    { files[$$0] = 1; } \
504
-	       END { for (i in files) print i; }'`; \
505
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
596
+ctags: ctags-recursive
597
+
598
+CTAGS: ctags
599
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
600
+	$(am__define_uniq_tagged_files); \
601
+	test -z "$(CTAGS_ARGS)$$unique" \
506 602
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
507
-	     $$tags $$unique
603
+	     $$unique
508 604
 
509 605
 GTAGS:
510 606
 	here=`$(am__cd) $(top_builddir) && pwd` \
511
-	  && cd $(top_srcdir) \
512
-	  && gtags -i $(GTAGS_ARGS) $$here
607
+	  && $(am__cd) $(top_srcdir) \
608
+	  && gtags -i $(GTAGS_ARGS) "$$here"
609
+cscopelist: cscopelist-recursive
610
+
611
+cscopelist-am: $(am__tagged_files)
612
+	list='$(am__tagged_files)'; \
613
+	case "$(srcdir)" in \
614
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
615
+	  *) sdir=$(subdir)/$(srcdir) ;; \
616
+	esac; \
617
+	for i in $$list; do \
618
+	  if test -f "$$i"; then \
619
+	    echo "$(subdir)/$$i"; \
620
+	  else \
621
+	    echo "$$sdir/$$i"; \
622
+	  fi; \
623
+	done >> $(top_builddir)/cscope.files
513 624
 
514 625
 distclean-tags:
515 626
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
516 627
 
517 628
 distdir: $(DISTFILES)
518
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
519
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
520
-	list='$(DISTFILES)'; for file in $$list; do \
521
-	  case $$file in \
522
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
523
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
524
-	  esac; \
629
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
630
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
631
+	list='$(DISTFILES)'; \
632
+	  dist_files=`for file in $$list; do echo $$file; done | \
633
+	  sed -e "s|^$$srcdirstrip/||;t" \
634
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
635
+	case $$dist_files in \
636
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
637
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
638
+			   sort -u` ;; \
639
+	esac; \
640
+	for file in $$dist_files; do \
525 641
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
526
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
527
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
528
-	    dir="/$$dir"; \
529
-	    $(mkdir_p) "$(distdir)$$dir"; \
530
-	  else \
531
-	    dir=''; \
532
-	  fi; \
533 642
 	  if test -d $$d/$$file; then \
643
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
644
+	    if test -d "$(distdir)/$$file"; then \
645
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
646
+	    fi; \
534 647
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
535
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
648
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
649
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
536 650
 	    fi; \
537
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
651
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
538 652
 	  else \
539
-	    test -f $(distdir)/$$file \
540
-	    || cp -p $$d/$$file $(distdir)/$$file \
653
+	    test -f "$(distdir)/$$file" \
654
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
541 655
 	    || exit 1; \
542 656
 	  fi; \
543 657
 	done
544
-	list='$(SUBDIRS)'; for subdir in $$list; do \
658
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
545 659
 	  if test "$$subdir" = .; then :; else \
546
-	    test -d "$(distdir)/$$subdir" \
547
-	    || mkdir "$(distdir)/$$subdir" \
548
-	    || exit 1; \
549
-	    (cd $$subdir && \
660
+	    $(am__make_dryrun) \
661
+	      || test -d "$(distdir)/$$subdir" \
662
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
663
+	      || exit 1; \
664
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
665
+	    $(am__relativize); \
666
+	    new_distdir=$$reldir; \
667
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
668
+	    $(am__relativize); \
669
+	    new_top_distdir=$$reldir; \
670
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
671
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
672
+	    ($(am__cd) $$subdir && \
550 673
 	      $(MAKE) $(AM_MAKEFLAGS) \
551
-	        top_distdir="../$(top_distdir)" \
552
-	        distdir="../$(distdir)/$$subdir" \
674
+	        top_distdir="$$new_top_distdir" \
675
+	        distdir="$$new_distdir" \
676
+		am__remove_distdir=: \
677
+		am__skip_length_check=: \
678
+		am__skip_mode_fix=: \
553 679
 	        distdir) \
554 680
 	      || exit 1; \
555 681
 	  fi; \
@@ -560,7 +686,7 @@ all-am: Makefile $(PROGRAMS) config.h
560 686
 installdirs: installdirs-recursive
561 687
 installdirs-am:
562 688
 	for dir in "$(DESTDIR)$(bindir)"; do \
563
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
689
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
564 690
 	done
565 691
 install: install-recursive
566 692
 install-exec: install-exec-recursive
@@ -572,16 +698,22 @@ install-am: all-am
572 698
 
573 699
 installcheck: installcheck-recursive
574 700
 install-strip:
575
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
576
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
577
-	  `test -z '$(STRIP)' || \
578
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
701
+	if test -z '$(STRIP)'; then \
702
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
703
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
704
+	      install; \
705
+	else \
706
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
707
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
708
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
709
+	fi
579 710
 mostlyclean-generic:
580 711
 
581 712
 clean-generic:
582 713
 
583 714
 distclean-generic:
584
-	-rm -f $(CONFIG_CLEAN_FILES)
715
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
716
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
585 717
 
586 718
 maintainer-clean-generic:
587 719
 	@echo "This command is intended for maintainers to use"
@@ -602,18 +734,38 @@ dvi-am:
602 734
 
603 735
 html: html-recursive
604 736
 
737
+html-am:
738
+
605 739
 info: info-recursive
606 740
 
607 741
 info-am:
608 742
 
609 743
 install-data-am:
610 744
 
745
+install-dvi: install-dvi-recursive
746
+
747
+install-dvi-am:
748
+
611 749
 install-exec-am: install-binPROGRAMS
612 750
 
751
+install-html: install-html-recursive
752
+
753
+install-html-am:
754
+
613 755
 install-info: install-info-recursive
614 756
 
757
+install-info-am:
758
+
615 759
 install-man:
616 760
 
761
+install-pdf: install-pdf-recursive
762
+
763
+install-pdf-am:
764
+
765
+install-ps: install-ps-recursive
766
+
767
+install-ps-am:
768
+
617 769
 installcheck-am:
618 770
 
619 771
 maintainer-clean: maintainer-clean-recursive
@@ -633,23 +785,24 @@ ps: ps-recursive
633 785
 
634 786
 ps-am:
635 787
 
636
-uninstall-am: uninstall-binPROGRAMS uninstall-info-am
637
-
638
-uninstall-info: uninstall-info-recursive
639
-
640
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
641
-	clean clean-binPROGRAMS clean-generic clean-recursive ctags \
642
-	ctags-recursive distclean distclean-compile distclean-generic \
643
-	distclean-hdr distclean-recursive distclean-tags distdir dvi \
644
-	dvi-am html html-am info info-am install install-am \
645
-	install-binPROGRAMS install-data install-data-am install-exec \
646
-	install-exec-am install-info install-info-am install-man \
647
-	install-strip installcheck installcheck-am installdirs \
648
-	installdirs-am maintainer-clean maintainer-clean-generic \
649
-	maintainer-clean-recursive mostlyclean mostlyclean-compile \
650
-	mostlyclean-generic mostlyclean-recursive pdf pdf-am ps ps-am \
651
-	tags tags-recursive uninstall uninstall-am \
652
-	uninstall-binPROGRAMS uninstall-info-am
788
+uninstall-am: uninstall-binPROGRAMS
789
+
790
+.MAKE: $(am__recursive_targets) all install-am install-strip
791
+
792
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
793
+	check-am clean clean-binPROGRAMS clean-generic cscopelist-am \
794
+	ctags ctags-am distclean distclean-compile distclean-generic \
795
+	distclean-hdr distclean-tags distdir dvi dvi-am html html-am \
796
+	info info-am install install-am install-binPROGRAMS \
797
+	install-data install-data-am install-dvi install-dvi-am \
798
+	install-exec install-exec-am install-html install-html-am \
799
+	install-info install-info-am install-man install-pdf \
800
+	install-pdf-am install-ps install-ps-am install-strip \
801
+	installcheck installcheck-am installdirs installdirs-am \
802
+	maintainer-clean maintainer-clean-generic mostlyclean \
803
+	mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
804
+	tags tags-am uninstall uninstall-am uninstall-binPROGRAMS
805
+
653 806
 
654 807
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
655 808
 # Otherwise a system limit (for SysV at least) may be exceeded.

+ 297
- 297
src/andna.c
File diff suppressed because it is too large
View File


+ 21
- 21
src/andns_lib.c View File

@@ -31,7 +31,7 @@ int andns_compress(char *src,int srclen)
31 31
 {
32 32
 	int res;
33 33
 	uLongf space;
34
-	
34
+
35 35
 	src+=ANDNS_HDR_SZ;
36 36
 	srclen-=ANDNS_HDR_SZ;
37 37
 	space=compressBound(srclen);
@@ -42,11 +42,11 @@ int andns_compress(char *src,int srclen)
42 42
 		 * the uncompressed size */
43 43
 	res=compress2(dst+ANDNS_HDR_Z, &space,(u_char *) src, srclen,
44 44
 			ANDNS_COMPR_LEVEL);
45
-	if (res!=Z_OK) 
45
+	if (res!=Z_OK)
46 46
 		err_ret(ERR_ZLIBCP,-1);
47
-	if (space >= srclen-ANDNS_HDR_Z) /* We have to consider the four 
47
+	if (space >= srclen-ANDNS_HDR_Z) /* We have to consider the four
48 48
 				  		bytes too */
49
-		err_ret(ERR_ZLIBNU,-1); /* This is a 
49
+		err_ret(ERR_ZLIBNU,-1); /* This is a
50 50
 					silent return */
51 51
 	res=htonl(srclen);
52 52
 	memcpy(dst,&res,ANDNS_HDR_Z);
@@ -54,7 +54,7 @@ int andns_compress(char *src,int srclen)
54 54
 
55 55
 	return (int)space;
56 56
 }
57
-char* andns_uncompress(char *src,int srclen,int *dstlen) 
57
+char* andns_uncompress(char *src,int srclen,int *dstlen)
58 58
 {
59 59
 	unsigned char *dst;
60 60
 	uLongf space;
@@ -64,7 +64,7 @@ char* andns_uncompress(char *src,int srclen,int *dstlen)
64 64
 
65 65
 	memcpy(&c_len,src+ANDNS_HDR_SZ,ANDNS_HDR_Z);
66 66
 	c_len=ntohl(c_len);
67
-	dst=xmalloc(c_len+ANDNS_HDR_SZ); 
67
+	dst=xmalloc(c_len+ANDNS_HDR_SZ);
68 68
 
69 69
 	space=c_len;
70 70
 
@@ -79,7 +79,7 @@ char* andns_uncompress(char *src,int srclen,int *dstlen)
79 79
 	}
80 80
 
81 81
 	memcpy(dst, src, ANDNS_HDR_SZ);
82
-	*dstlen=c_len+ANDNS_HDR_SZ; 
82
+	*dstlen=c_len+ANDNS_HDR_SZ;
83 83
 
84 84
 	return (char*)dst;
85 85
 }
@@ -104,7 +104,7 @@ int a_hdr_u(char *buf,andns_pkt *ap)
104 104
 	ap->id>>=1;
105 105
         buf+=2;
106 106
 
107
-        memcpy(&c,buf,2);
107
+        memcpy(&c,buf,sizeof(uint8_t));
108 108
         ap->qr=(c>>7)&0x01;
109 109
         ap->p=c&0x40?ANDNS_PROTO_UDP:ANDNS_PROTO_TCP;
110 110
 	ap->z=c&0x20;
@@ -150,7 +150,7 @@ int a_qst_u(char *buf,andns_pkt *ap,int limitlen)
150 150
 				memcpy(&s,buf,2);
151 151
 				ap->qstlength=ntohs(s);
152 152
 				buf+=2;
153
-        			if (ap->qstlength>=ANDNS_MAX_QST_LEN || 
153
+        			if (ap->qstlength>=ANDNS_MAX_QST_LEN ||
154 154
 					ap->qstlength>limitlen-4)
155 155
                 			err_ret(ERR_ANDPLB,-1);
156 156
 				AP_ALIGN(ap);
@@ -243,7 +243,7 @@ int a_answ_u(char *buf,andns_pkt *ap,int limitlen)
243 243
 			memcpy(&alen,buf,2);
244 244
 			apd->service=ntohs(alen);
245 245
 			buf+=2;
246
-			if (apd->m&APD_IP) 
246
+			if (apd->m&APD_IP)
247 247
 				apd->rdlength=(ap->ipv?16:4);
248 248
 			else
249 249
 				apd->rdlength=ANDNS_HASH_H;
@@ -268,7 +268,7 @@ int a_answs_u(char *buf,andns_pkt *ap,int limitlen)
268 268
 		memcpy(&alen,buf,sizeof(uint16_t));
269 269
 		ap->ancount=ntohs(alen);
270 270
 		offset+=2;
271
-	} 		
271
+	}
272 272
 	ancount=ap->ancount;
273 273
         for (i=0;i<ancount;i++) {
274 274
                 res=a_answ_u(buf+offset,ap,limitlen-offset);
@@ -303,15 +303,15 @@ int a_u(char *buf,int pktlen,andns_pkt **app)
303 303
         *app=ap=create_andns_pkt();
304 304
         offset=a_hdr_u(buf,ap);
305 305
 
306
-	if (ap->z) { /* Controls the space to read 
306
+	if (ap->z) { /* Controls the space to read
307 307
 			uncompressed size */
308 308
 		if (pktlen<ANDNS_HDR_SZ+ANDNS_HDR_Z) {
309 309
 			destroy_andns_pkt(ap);
310 310
                 	err_ret(ERR_ANDPLB,0);
311 311
 		}
312
-		if (!(u_buf=andns_uncompress(buf,pktlen,&u_len))) 
312
+		if (!(u_buf=andns_uncompress(buf,pktlen,&u_len)))
313 313
 			goto andmap;
314
-		destroy_andns_pkt(ap); 
314
+		destroy_andns_pkt(ap);
315 315
 		ANDNS_UNSET_Z(u_buf);
316 316
 		res=a_u(u_buf,u_len,app);
317 317
 		xfree(u_buf);
@@ -319,14 +319,14 @@ int a_u(char *buf,int pktlen,andns_pkt **app)
319 319
 	}
320 320
         buf+=offset;
321 321
         limitlen=pktlen-offset;
322
-        if ((res=a_qst_u(buf,ap,limitlen))==-1) 
322
+        if ((res=a_qst_u(buf,ap,limitlen))==-1)
323 323
 		goto andmap;
324 324
 	offset+=res;
325 325
 	if (!ap->ancount) /*No answers */
326 326
 		return offset;
327 327
 	buf+=res;
328 328
 	limitlen-=res;
329
-	if ((res=a_answs_u(buf,ap,limitlen))==-1) 
329
+	if ((res=a_answs_u(buf,ap,limitlen))==-1)
330 330
 		goto andmap;
331 331
 	offset+=res;
332 332
 	if (offset!=pktlen)
@@ -342,13 +342,13 @@ int a_hdr_p(andns_pkt *ap,char *buf)
342 342
 {
343 343
         uint16_t s;
344 344
 	uint8_t an;
345
-	
345
+
346 346
 	ap->id<<=1;
347 347
         s=htons(ap->id);
348 348
         memcpy(buf,&s,sizeof(uint16_t));
349 349
 	if (ap->r)
350 350
 		*(buf+1)|=0x01;
351
-	else	
351
+	else
352 352
 		*(buf+1)&=0xfe;
353 353
         buf+=2;
354 354
         if (ap->qr)
@@ -387,7 +387,7 @@ int a_qst_p(andns_pkt *ap,char *buf,int limitlen)
387 387
 			} else if (ap->nk==INET_REALM) {
388 388
 				s=htons(ap->qstlength);
389 389
 				memcpy(buf,&s,2);
390
-				buf+=2; 
390
+				buf+=2;
391 391
 				memcpy(buf,ap->qstdata,ap->qstlength);
392 392
 				ret=ap->qstlength+4;
393 393
 			} else
@@ -419,7 +419,7 @@ int a_answ_p(andns_pkt *ap,andns_pkt_data *apd,char *buf,int limitlen)
419 419
         uint16_t s;
420 420
 	int limit;
421 421
 	int ret;
422
-	
422
+
423 423
 	switch(ap->qtype) {
424 424
 		case AT_A:
425 425
 			limit=ap->ipv?16:4;
@@ -489,7 +489,7 @@ int a_answs_p(andns_pkt *ap,char *buf, int limitlen)
489 489
 		s=htons(ap->ancount);
490 490
 		memcpy(buf,&s,2);
491 491
 		offset+=2;
492
-	} 
492
+	}
493 493
         apd=ap->pkt_answ;
494 494
         for (i=0;i<ap->ancount && apd;i++) {
495 495
                 if((res=a_answ_p(ap,apd,buf+offset,limitlen-offset))==-1) {

+ 214
- 71
src/conf/Makefile.in View File

@@ -1,8 +1,8 @@
1
-# Makefile.in generated by automake 1.8.5 from Makefile.am.
1
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5
-# 2003, 2004  Free Software Foundation, Inc.
4
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
5
+
6 6
 # This Makefile.in is free software; the Free Software Foundation
7 7
 # gives unlimited permission to copy and/or distribute it,
8 8
 # with or without modifications, as long as this notice is preserved.
@@ -14,15 +14,57 @@
14 14
 
15 15
 @SET_MAKE@
16 16
 
17
-srcdir = @srcdir@
18
-top_srcdir = @top_srcdir@
19 17
 VPATH = @srcdir@
18
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
19
+am__make_running_with_option = \
20
+  case $${target_option-} in \
21
+      ?) ;; \
22
+      *) echo "am__make_running_with_option: internal error: invalid" \
23
+              "target option '$${target_option-}' specified" >&2; \
24
+         exit 1;; \
25
+  esac; \
26
+  has_opt=no; \
27
+  sane_makeflags=$$MAKEFLAGS; \
28
+  if $(am__is_gnu_make); then \
29
+    sane_makeflags=$$MFLAGS; \
30
+  else \
31
+    case $$MAKEFLAGS in \
32
+      *\\[\ \	]*) \
33
+        bs=\\; \
34
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
35
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
36
+    esac; \
37
+  fi; \
38
+  skip_next=no; \
39
+  strip_trailopt () \
40
+  { \
41
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
42
+  }; \
43
+  for flg in $$sane_makeflags; do \
44
+    test $$skip_next = yes && { skip_next=no; continue; }; \
45
+    case $$flg in \
46
+      *=*|--*) continue;; \
47
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
48
+      -*I?*) strip_trailopt 'I';; \
49
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
50
+      -*O?*) strip_trailopt 'O';; \
51
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
52
+      -*l?*) strip_trailopt 'l';; \
53
+      -[dEDm]) skip_next=yes;; \
54
+      -[JT]) skip_next=yes;; \
55
+    esac; \
56
+    case $$flg in \
57
+      *$$target_option*) has_opt=yes; break;; \
58
+    esac; \
59
+  done; \
60
+  test $$has_opt = yes
61
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
62
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
20 63
 pkgdatadir = $(datadir)/@PACKAGE@
21
-pkglibdir = $(libdir)/@PACKAGE@
22 64
 pkgincludedir = $(includedir)/@PACKAGE@
23
-top_builddir = ../..
65
+pkglibdir = $(libdir)/@PACKAGE@
66
+pkglibexecdir = $(libexecdir)/@PACKAGE@
24 67
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
25
-INSTALL = @INSTALL@
26 68
 install_sh_DATA = $(install_sh) -c -m 644
27 69
 install_sh_PROGRAM = $(install_sh) -c
28 70
 install_sh_SCRIPT = $(install_sh) -c
@@ -34,27 +76,72 @@ POST_INSTALL = :
34 76
 NORMAL_UNINSTALL = :
35 77
 PRE_UNINSTALL = :
36 78
 POST_UNINSTALL = :
79
+build_triplet = @build@
37 80
 host_triplet = @host@
38 81
 subdir = src/conf
39
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
82
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
40 83
 	$(srcdir)/netsukuku.conf.in
41 84
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
42 85
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
43 86
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
44 87
 	$(ACLOCAL_M4)
45
-mkinstalldirs = $(mkdir_p)
88
+mkinstalldirs = $(install_sh) -d
46 89
 CONFIG_HEADER = $(top_builddir)/src/config.h
47 90
 CONFIG_CLEAN_FILES = netsukuku.conf
91
+CONFIG_CLEAN_VPATH_FILES =
92
+AM_V_P = $(am__v_P_@AM_V@)
93
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
94
+am__v_P_0 = false
95
+am__v_P_1 = :
96
+AM_V_GEN = $(am__v_GEN_@AM_V@)
97
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
98
+am__v_GEN_0 = @echo "  GEN     " $@;
99
+am__v_GEN_1 = 
100
+AM_V_at = $(am__v_at_@AM_V@)
101
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
102
+am__v_at_0 = @
103
+am__v_at_1 = 
48 104
 SOURCES =
49 105
 DIST_SOURCES =
106
+am__can_run_installinfo = \
107
+  case $$AM_UPDATE_INFO_DIR in \
108
+    n|no|NO) false;; \
109
+    *) (install-info --version) >/dev/null 2>&1;; \
110
+  esac
111
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
112
+am__vpath_adj = case $$p in \
113
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
114
+    *) f=$$p;; \
115
+  esac;
116
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
117
+am__install_max = 40
118
+am__nobase_strip_setup = \
119
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
120
+am__nobase_strip = \
121
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
122
+am__nobase_list = $(am__nobase_strip_setup); \
123
+  for p in $$list; do echo "$$p $$p"; done | \
124
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
125
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
126
+    if (++n[$$2] == $(am__install_max)) \
127
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
128
+    END { for (dir in files) print dir, files[dir] }'
129
+am__base_list = \
130
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
131
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
132
+am__uninstall_files_from_dir = { \
133
+  test -z "$$files" \
134
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
135
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
136
+         $(am__cd) "$$dir" && rm -f $$files; }; \
137
+  }
50 138
 am__installdirs = "$(DESTDIR)$(sysconfdir)"
51
-sysconfDATA_INSTALL = $(INSTALL_DATA)
52 139
 DATA = $(sysconf_DATA)
140
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
53 141
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
54 142
 ACLOCAL = @ACLOCAL@
55
-AMDEP_FALSE = @AMDEP_FALSE@
56
-AMDEP_TRUE = @AMDEP_TRUE@
57 143
 AMTAR = @AMTAR@
144
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
58 145
 AUTOCONF = @AUTOCONF@
59 146
 AUTOHEADER = @AUTOHEADER@
60 147
 AUTOMAKE = @AUTOMAKE@
@@ -77,7 +164,9 @@ ECHO_N = @ECHO_N@
77 164
 ECHO_T = @ECHO_T@
78 165
 EGREP = @EGREP@
79 166
 EXEEXT = @EXEEXT@
167
+GREP = @GREP@
80 168
 IF_METHOD = @IF_METHOD@
169
+INSTALL = @INSTALL@
81 170
 INSTALL_DATA = @INSTALL_DATA@
82 171
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
83 172
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -88,6 +177,7 @@ LIBOBJS = @LIBOBJS@
88 177
 LIBS = @LIBS@
89 178
 LTLIBOBJS = @LTLIBOBJS@
90 179
 MAKEINFO = @MAKEINFO@
180
+MKDIR_P = @MKDIR_P@
91 181
 OBJEXT = @OBJEXT@
92 182
 OTHER_METHOD = @OTHER_METHOD@
93 183
 PACKAGE = @PACKAGE@
@@ -95,6 +185,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
95 185
 PACKAGE_NAME = @PACKAGE_NAME@
96 186
 PACKAGE_STRING = @PACKAGE_STRING@
97 187
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
188
+PACKAGE_URL = @PACKAGE_URL@
98 189
 PACKAGE_VERSION = @PACKAGE_VERSION@
99 190
 PATH_SEPARATOR = @PATH_SEPARATOR@
100 191
 PID_DIR = @PID_DIR@
@@ -103,24 +194,29 @@ SET_MAKE = @SET_MAKE@
103 194
 SHELL = @SHELL@
104 195
 STRIP = @STRIP@
105 196
 VERSION = @VERSION@
197
+abs_builddir = @abs_builddir@
198
+abs_srcdir = @abs_srcdir@
199
+abs_top_builddir = @abs_top_builddir@
200
+abs_top_srcdir = @abs_top_srcdir@
106 201
 ac_ct_CC = @ac_ct_CC@
107 202
 ac_ct_CXX = @ac_ct_CXX@
108
-ac_ct_STRIP = @ac_ct_STRIP@
109
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
110
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
111
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
112
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
113 203
 am__include = @am__include@
114 204
 am__leading_dot = @am__leading_dot@
115 205
 am__quote = @am__quote@
206
+am__tar = @am__tar@
207
+am__untar = @am__untar@
116 208
 bindir = @bindir@
117 209
 build = @build@
118 210
 build_alias = @build_alias@
119 211
 build_cpu = @build_cpu@
120 212
 build_os = @build_os@
121 213
 build_vendor = @build_vendor@
214
+builddir = @builddir@
122 215
 datadir = @datadir@
216
+datarootdir = @datarootdir@
123 217
 debug_flags = @debug_flags@
218
+docdir = @docdir@
219
+dvidir = @dvidir@
124 220
 exec_prefix = @exec_prefix@
125 221
 gmp = @gmp@
126 222
 host = @host@
@@ -128,21 +224,29 @@ host_alias = @host_alias@
128 224
 host_cpu = @host_cpu@
129 225
 host_os = @host_os@
130 226
 host_vendor = @host_vendor@
227
+htmldir = @htmldir@
131 228
 includedir = @includedir@
132 229
 infodir = @infodir@
133 230
 install_sh = @install_sh@
134 231
 libdir = @libdir@
135 232
 libexecdir = @libexecdir@
233
+localedir = @localedir@
136 234
 localstatedir = @localstatedir@
137 235
 mandir = @mandir@
138 236
 mkdir_p = @mkdir_p@
139 237
 oldincludedir = @oldincludedir@
238
+pdfdir = @pdfdir@
140 239
 prefix = @prefix@
141 240
 program_transform_name = @program_transform_name@
241
+psdir = @psdir@
142 242
 sbindir = @sbindir@
143 243
 sharedstatedir = @sharedstatedir@
244
+srcdir = @srcdir@
144 245
 sysconfdir = @sysconfdir@
145 246
 target_alias = @target_alias@
247
+top_build_prefix = @top_build_prefix@
248
+top_builddir = @top_builddir@
249
+top_srcdir = @top_srcdir@
146 250
 sysconf_DATA = netsukuku.conf andna_hostnames snsd_nodes
147 251
 all: all-am
148 252
 
@@ -151,14 +255,14 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
151 255
 	@for dep in $?; do \
152 256
 	  case '$(am__configure_deps)' in \
153 257
 	    *$$dep*) \
154
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
155
-		&& exit 0; \
258
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
259
+	        && { if test -f $@; then exit 0; else break; fi; }; \
156 260
 	      exit 1;; \
157 261
 	  esac; \
158 262
 	done; \
159
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/conf/Makefile'; \
160
-	cd $(top_srcdir) && \
161
-	  $(AUTOMAKE) --gnu  src/conf/Makefile
263
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/conf/Makefile'; \
264
+	$(am__cd) $(top_srcdir) && \
265
+	  $(AUTOMAKE) --gnu src/conf/Makefile
162 266
 .PRECIOUS: Makefile
163 267
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
164 268
 	@case '$?' in \
@@ -176,57 +280,64 @@ $(top_srcdir)/configure:  $(am__configure_deps)
176 280
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
177 281
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
178 282
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
283
+$(am__aclocal_m4_deps):
179 284
 netsukuku.conf: $(top_builddir)/config.status $(srcdir)/netsukuku.conf.in
180 285
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
181
-uninstall-info-am:
182 286
 install-sysconfDATA: $(sysconf_DATA)
183 287
 	@$(NORMAL_INSTALL)
184
-	test -z "$(sysconfdir)" || $(mkdir_p) "$(DESTDIR)$(sysconfdir)"
185
-	@list='$(sysconf_DATA)'; for p in $$list; do \
288
+	@list='$(sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \
289
+	if test -n "$$list"; then \
290
+	  echo " $(MKDIR_P) '$(DESTDIR)$(sysconfdir)'"; \
291
+	  $(MKDIR_P) "$(DESTDIR)$(sysconfdir)" || exit 1; \
292
+	fi; \
293
+	for p in $$list; do \
186 294
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
187
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
188
-	  echo " $(sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \
189
-	  $(sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \
295
+	  echo "$$d$$p"; \
296
+	done | $(am__base_list) | \
297
+	while read files; do \
298
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(sysconfdir)'"; \
299
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(sysconfdir)" || exit $$?; \
190 300
 	done
191 301
 
192 302
 uninstall-sysconfDATA:
193 303
 	@$(NORMAL_UNINSTALL)
194
-	@list='$(sysconf_DATA)'; for p in $$list; do \
195
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
196
-	  echo " rm -f '$(DESTDIR)$(sysconfdir)/$$f'"; \
197
-	  rm -f "$(DESTDIR)$(sysconfdir)/$$f"; \
198
-	done
199
-tags: TAGS
200
-TAGS:
304
+	@list='$(sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \
305
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
306
+	dir='$(DESTDIR)$(sysconfdir)'; $(am__uninstall_files_from_dir)
307
+tags TAGS:
308
+
309
+ctags CTAGS:
201 310
 
202
-ctags: CTAGS
203
-CTAGS:
311
+cscope cscopelist:
204 312
 
205 313
 
206 314
 distdir: $(DISTFILES)
207
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
208
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
209
-	list='$(DISTFILES)'; for file in $$list; do \
210
-	  case $$file in \
211
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
212
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
213
-	  esac; \
315
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
316
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
317
+	list='$(DISTFILES)'; \
318
+	  dist_files=`for file in $$list; do echo $$file; done | \
319
+	  sed -e "s|^$$srcdirstrip/||;t" \
320
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
321
+	case $$dist_files in \
322
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
323
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
324
+			   sort -u` ;; \
325
+	esac; \
326
+	for file in $$dist_files; do \
214 327
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
215
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
216
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
217
-	    dir="/$$dir"; \
218
-	    $(mkdir_p) "$(distdir)$$dir"; \
219
-	  else \
220
-	    dir=''; \
221
-	  fi; \
222 328
 	  if test -d $$d/$$file; then \
329
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
330
+	    if test -d "$(distdir)/$$file"; then \
331
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
332
+	    fi; \
223 333
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
224
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
334
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
335
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
225 336
 	    fi; \
226
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
337
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
227 338
 	  else \
228
-	    test -f $(distdir)/$$file \
229
-	    || cp -p $$d/$$file $(distdir)/$$file \
339
+	    test -f "$(distdir)/$$file" \
340
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
230 341
 	    || exit 1; \
231 342
 	  fi; \
232 343
 	done
@@ -235,7 +346,7 @@ check: check-am
235 346
 all-am: Makefile $(DATA)
236 347
 installdirs:
237 348
 	for dir in "$(DESTDIR)$(sysconfdir)"; do \
238
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
349
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
239 350
 	done
240 351
 install: install-am
241 352
 install-exec: install-exec-am
@@ -247,16 +358,22 @@ install-am: all-am
247 358
 
248 359
 installcheck: installcheck-am
249 360
 install-strip:
250
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
251
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
252
-	  `test -z '$(STRIP)' || \
253
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
361
+	if test -z '$(STRIP)'; then \
362
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
363
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
364
+	      install; \
365
+	else \
366
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
367
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
368
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
369
+	fi
254 370
 mostlyclean-generic:
255 371
 
256 372
 clean-generic:
257 373
 
258 374
 distclean-generic:
259
-	-rm -f $(CONFIG_CLEAN_FILES)
375
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
376
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
260 377
 
261 378
 maintainer-clean-generic:
262 379
 	@echo "This command is intended for maintainers to use"
@@ -275,18 +392,38 @@ dvi-am:
275 392
 
276 393
 html: html-am
277 394
 
395
+html-am:
396
+
278 397
 info: info-am
279 398
 
280 399
 info-am:
281 400
 
282 401
 install-data-am:
283 402
 
403
+install-dvi: install-dvi-am
404
+
405
+install-dvi-am:
406
+
284 407
 install-exec-am: install-sysconfDATA
285 408
 
409
+install-html: install-html-am
410
+
411
+install-html-am:
412
+
286 413
 install-info: install-info-am
287 414
 
415
+install-info-am:
416
+
288 417
 install-man:
289 418
 
419
+install-pdf: install-pdf-am
420
+
421
+install-pdf-am:
422
+
423
+install-ps: install-ps-am
424
+
425
+install-ps-am:
426
+
290 427
 installcheck-am:
291 428
 
292 429
 maintainer-clean: maintainer-clean-am
@@ -305,16 +442,22 @@ ps: ps-am
305 442
 
306 443
 ps-am:
307 444
 
308
-uninstall-am: uninstall-info-am uninstall-sysconfDATA
445
+uninstall-am: uninstall-sysconfDATA
446
+
447
+.MAKE: install-am install-strip
448
+
449
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
450
+	ctags-am distclean distclean-generic distdir dvi dvi-am html \
451
+	html-am info info-am install install-am install-data \
452
+	install-data-am install-dvi install-dvi-am install-exec \
453
+	install-exec-am install-html install-html-am install-info \
454
+	install-info-am install-man install-pdf install-pdf-am \
455
+	install-ps install-ps-am install-strip install-sysconfDATA \
456
+	installcheck installcheck-am installdirs maintainer-clean \
457
+	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
458
+	pdf-am ps ps-am tags-am uninstall uninstall-am \
459
+	uninstall-sysconfDATA
309 460
 
310
-.PHONY: all all-am check check-am clean clean-generic distclean \
311
-	distclean-generic distdir dvi dvi-am html html-am info info-am \
312
-	install install-am install-data install-data-am install-exec \
313
-	install-exec-am install-info install-info-am install-man \
314
-	install-strip install-sysconfDATA installcheck installcheck-am \
315
-	installdirs maintainer-clean maintainer-clean-generic \
316
-	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
317
-	uninstall-am uninstall-info-am uninstall-sysconfDATA
318 461
 
319 462
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
320 463
 # Otherwise a system limit (for SysV at least) may be exceeded.

+ 3
- 0
src/config.h.in View File

@@ -90,6 +90,9 @@
90 90
 /* Define to the one symbol short name of this package. */
91 91
 #undef PACKAGE_TARNAME
92 92
 
93
+/* Define to the home page for this package. */
94
+#undef PACKAGE_URL
95
+
93 96
 /* Define to the version of this package. */
94 97
 #undef PACKAGE_VERSION
95 98
 

+ 179
- 178
src/gmap.c
File diff suppressed because it is too large
View File


+ 89
- 89
src/inet.c View File

@@ -2,7 +2,7 @@
2 2
  * (c) Copyright 2005 Andrea Lo Pumo aka AlpT <alpt@freaknet.org>
3 3
  *
4 4
  * This source code is free software; you can redistribute it and/or
5
- * modify it under the terms of the GNU General Public License as published 
5
+ * modify it under the terms of the GNU General Public License as published
6 6
  * by the Free Software Foundation; either version 2 of the License,
7 7
  * or (at your option) any later version.
8 8
  *
@@ -26,7 +26,7 @@
26 26
 #include "endianness.h"
27 27
 
28 28
 
29
-/* 
29
+/*
30 30
  * inet_ntohl: Converts each element of `data' from network to host order. If
31 31
  * `family' is equal to AF_INET6, the array is swapped too (on big endian
32 32
  * machine).
@@ -45,7 +45,7 @@ void inet_ntohl(u_int *data, int family)
45 45
 #endif
46 46
 }
47 47
 
48
-/* 
48
+/*
49 49
  * inet_htonl: Converts each element of `data' from host to network order. If
50 50
  * `family' is equal to AF_INET6, the array is swapped too (on big endian
51 51
  * machine).
@@ -71,18 +71,18 @@ int inet_setip_raw(inet_prefix *ip, u_int *data, int family)
71 71
 {
72 72
 	ip->family=family;
73 73
 	setzero(ip->data, sizeof(ip->data));
74
-	
74
+
75 75
 	if(family==AF_INET) {
76 76
 		ip->data[0]=data[0];
77 77
 		ip->len=4;
78 78
 	} else if(family==AF_INET6) {
79 79
 		memcpy(ip->data, data, sizeof(ip->data));
80 80
 		ip->len=16;
81
-	} else 
81
+	} else
82 82
 		fatal(ERROR_MSG "family not supported", ERROR_POS);
83 83
 
84 84
 	ip->bits=ip->len<<3; /* bits=len*8 */
85
-	
85
+
86 86
 	return 0;
87 87
 }
88 88
 
@@ -107,7 +107,7 @@ int inet_setip_bcast(inet_prefix *ip, int family)
107 107
 	} else if(family==AF_INET6) {
108 108
 		u_int data[MAX_IP_INT]=IPV6_ADDR_BROADCAST;
109 109
 		inet_setip(ip, data, family);
110
-	} else 
110
+	} else
111 111
 		fatal(ERROR_MSG "family not supported", ERROR_POS);
112 112
 
113 113
 	return 0;
@@ -117,13 +117,13 @@ int inet_setip_anyaddr(inet_prefix *ip, int family)
117 117
 {
118 118
 	if(family==AF_INET) {
119 119
 		u_int data[MAX_IP_INT]={0, 0, 0, 0};
120
-		
120
+
121 121
 		data[0]=INADDR_ANY;
122 122
 		inet_setip(ip, data, family);
123 123
 	} else if(family==AF_INET6) {
124 124
 		struct in6_addr ipv6=IN6ADDR_ANY_INIT;
125 125
 		inet_setip(ip, (u_int *)(&ipv6), family);
126
-	} else 
126
+	} else
127 127
 		fatal(ERROR_MSG "family not supported", ERROR_POS);
128 128
 
129 129
 	return 0;
@@ -133,22 +133,22 @@ int inet_setip_loopback(inet_prefix *ip, int family)
133 133
 {
134 134
 	if(family==AF_INET) {
135 135
 		u_int data[MAX_IP_INT]={0, 0, 0, 0};
136
-		
136
+
137 137
 		data[0]=LOOPBACK_IP;
138 138
 		inet_setip(ip, data, family);
139 139
 		inet_htonl(ip->data, ip->family);
140 140
 	} else if(family==AF_INET6) {
141 141
 		u_int data[MAX_IP_INT]=LOOPBACK_IPV6;
142 142
 		inet_setip(ip, data, family);
143
-	} else 
143
+	} else
144 144
 		fatal(ERROR_MSG "family not supported", ERROR_POS);
145 145
 
146 146
 	return 0;
147 147
 }
148 148
 
149
-/* 
149
+/*
150 150
  * inet_setip_localaddr: Restrict the `ip' to a local private class changing the
151
- * first byte of the `ip'. `class' specifies what restricted class is currently 
151
+ * first byte of the `ip'. `class' specifies what restricted class is currently
152 152
  * being used (10.x.x.x or 172.16.x.x). In ipv6 the site local class is the
153 153
  * default.
154 154
  */
@@ -157,11 +157,11 @@ int inet_setip_localaddr(inet_prefix *ip, int family, int class)
157 157
 	if(family==AF_INET) {
158 158
 		if(class == RESTRICTED_10)
159 159
 			ip->data[0] = NTK_RESTRICTED_10_MASK(ip->data[0]);
160
-		else 
160
+		else
161 161
 			ip->data[0] = NTK_RESTRICTED_172_MASK(ip->data[0]);
162 162
 	} else if(family==AF_INET6) {
163 163
 		ip->data[0] = NTK_RESTRICTED_IPV6_MASK(ip->data[0]);
164
-	} else 
164
+	} else
165 165
 		fatal(ERROR_MSG "family not supported", ERROR_POS);
166 166
 
167 167
 	return 0;
@@ -169,7 +169,7 @@ int inet_setip_localaddr(inet_prefix *ip, int family, int class)
169 169
 
170 170
 /*
171 171
  * inet_is_ip_local: verifies if `ip' is a local address. If it is, 1 is
172
- * returned. `class' specifies what restricted class is currently 
172
+ * returned. `class' specifies what restricted class is currently
173 173
  * being used (10.x.x.x or 172.16.x.x). In ipv6 the site local class is the
174 174
  * default.
175 175
  */
@@ -236,7 +236,7 @@ void pack_inet_prefix(inet_prefix *ip, char *pack)
236 236
 	memcpy(buf, ip->data, MAX_IP_SZ);
237 237
 	inet_htonl((u_int *)buf, ip->family);
238 238
 	buf+=MAX_IP_SZ;
239
-	
239
+
240 240
 	ints_host_to_network(pack, inet_prefix_iinfo);
241 241
 }
242 242
 
@@ -249,7 +249,7 @@ void unpack_inet_prefix(inet_prefix *ip, char *pack)
249 249
 	char *buf;
250 250
 
251 251
 	buf=pack;
252
-	
252
+
253 253
 	ints_network_to_host(pack, inet_prefix_iinfo);
254 254
 
255 255
 	memcpy(&ip->family, buf, sizeof(u_char));
@@ -266,18 +266,18 @@ void unpack_inet_prefix(inet_prefix *ip, char *pack)
266 266
 	buf+=MAX_IP_SZ;
267 267
 }
268 268
 
269
-/* 
269
+/*
270 270
  * inet_addr_match: without hesitating this function was robbed from iproute2.
271 271
  * It compares a->data wih b->data matching `bits'# bits.
272 272
  */
273 273
 int inet_addr_match(const inet_prefix *a, const inet_prefix *b, int bits)
274 274
 {
275
-        uint32_t *a1 = a->data;
276
-        uint32_t *a2 = b->data;
275
+        const uint32_t *a1 = a->data;
276
+        const uint32_t *a2 = b->data;
277 277
         int words = bits >> 0x05;
278
-        
278
+
279 279
         bits &= 0x1f;
280
-        
280
+
281 281
         if (words)
282 282
                 if (memcmp(a1, a2, words << 2))
283 283
                         return -1;
@@ -332,7 +332,7 @@ int ipv6_addr_type(inet_prefix addr)
332 332
 	if ((st & htonl(0xE0000000)) != htonl(0x00000000) &&
333 333
 	    (st & htonl(0xE0000000)) != htonl(0xE0000000))
334 334
 		return type;
335
-	
335
+
336 336
 	if ((st & htonl(0xFFC00000)) == htonl(0xFE800000))
337 337
 		return (IPV6_ADDR_LINKLOCAL | type);
338 338
 
@@ -375,14 +375,14 @@ int inet_validate_ip(inet_prefix ip)
375 375
 
376 376
 	if(ip.family==AF_INET) {
377 377
 		ipv4=htonl(ip.data[0]);
378
-		if(MULTICAST(ipv4) || BADCLASS(ipv4) || ZERONET(ipv4) 
378
+		if(MULTICAST(ipv4) || BADCLASS(ipv4) || ZERONET(ipv4)
379 379
 			|| LOOPBACK(ipv4) || NTK_PRIVATE_C(ipv4) ||
380 380
 			(!restricted_mode && NTK_PRIVATE_B(ipv4)))
381 381
 			return -EINVAL;
382 382
 
383 383
 	} else if(ip.family==AF_INET6) {
384 384
 		type=ipv6_addr_type(ip);
385
-		if( (type & IPV6_ADDR_MULTICAST) || (type & IPV6_ADDR_RESERVED) || 
385
+		if( (type & IPV6_ADDR_MULTICAST) || (type & IPV6_ADDR_RESERVED) ||
386 386
 				(type & IPV6_ADDR_LOOPBACK))
387 387
 			return -EINVAL;
388 388
 	}
@@ -396,8 +396,8 @@ int inet_validate_ip(inet_prefix ip)
396 396
 
397 397
 /*\
398 398
  *
399
- *  *  *  Conversion functions...  *  * 
400
- * 
399
+ *  *  *  Conversion functions...  *  *
400
+ *
401 401
 \*/
402 402
 
403 403
 /*
@@ -413,7 +413,7 @@ const char *ipraw_to_str(u_int ip[MAX_IP_INT], int family)
413 413
 	if(family==AF_INET) {
414 414
 		src.s_addr=htonl(ip[0]);
415 415
 		inet_ntop(family, &src, dst, INET_ADDRSTRLEN);
416
-		
416
+
417 417
 		return dst;
418 418
 	} else if(family==AF_INET6) {
419 419
 		inet_htonl(ip, family);
@@ -457,7 +457,7 @@ int str_to_inet(const char *src, inet_prefix *ip)
457 457
 	}
458 458
 
459 459
 	if((res=inet_pton(family, src, (void *)data)) < 0) {
460
-		debug(DBG_NORMAL, ERROR_MSG "error -> %s.", 
460
+		debug(DBG_NORMAL, ERROR_MSG "error -> %s.",
461 461
 				ERROR_FUNC, strerror(errno));
462 462
 		return -1;
463 463
 	}
@@ -478,27 +478,27 @@ int inet_to_sockaddr(inet_prefix *ip, u_short port, struct sockaddr *dst,
478 478
 		socklen_t *dstlen)
479 479
 {
480 480
 	port=htons(port);
481
-	
481
+
482 482
 	if(ip->family==AF_INET) {
483 483
 		struct sockaddr_in sin;
484 484
 		setzero(&sin,  sizeof(struct sockaddr_in));
485
-		
485
+
486 486
 		sin.sin_family = ip->family;
487 487
 		sin.sin_port = port;
488 488
 		sin.sin_addr.s_addr = htonl(ip->data[0]);
489 489
 		memcpy(dst, &sin, sizeof(struct sockaddr_in));
490
-		
490
+
491 491
 		if(dstlen)
492 492
 			*dstlen=sizeof(struct sockaddr_in);
493 493
 
494 494
 	} else if(ip->family==AF_INET6) {
495 495
 		struct sockaddr_in6 sin6;
496 496
 		setzero(&sin6,  sizeof(struct sockaddr_in6));
497
-		
497
+
498 498
 		sin6.sin6_family = ip->family;
499 499
 		sin6.sin6_port = port;
500 500
 		sin6.sin6_flowinfo = 0;
501
-		
501
+
502 502
 		memcpy(&sin6.sin6_addr, ip->data, MAX_IP_SZ);
503 503
 		inet_htonl((u_int *)&sin6.sin6_addr, ip->family);
504 504
 
@@ -516,14 +516,14 @@ int sockaddr_to_inet(struct sockaddr *ip, inet_prefix *dst, u_short *port)
516 516
 {
517 517
 	u_short po;
518 518
 	char *p;
519
-	
519
+
520 520
 	setzero(dst,  sizeof(inet_prefix));
521
-	
521
+
522 522
 	dst->family=ip->sa_family;
523 523
 	memcpy(&po, &ip->sa_data, sizeof(u_short));
524 524
 	if(port)
525 525
 		*port=ntohs(po);
526
-	
526
+
527 527
 	if(ip->sa_family==AF_INET)
528 528
 		p=(char *)ip->sa_data+sizeof(u_short);
529 529
 	else if(ip->sa_family==AF_INET6)
@@ -532,7 +532,7 @@ int sockaddr_to_inet(struct sockaddr *ip, inet_prefix *dst, u_short *port)
532 532
 		error(ERROR_MSG "family not supported", ERROR_POS);
533 533
 		return -1;
534 534
 	}
535
-		
535
+
536 536
 	inet_setip(dst, (u_int *)p, ip->sa_family);
537 537
 
538 538
 	return 0;
@@ -566,7 +566,7 @@ int new_dgram_socket(int sock_type)
566 566
 	return sockfd;
567 567
 }
568 568
 
569
-/* 
569
+/*
570 570
  * inet_close
571 571
  *
572 572
  * It closes the `*sk' socket and sets it to zero.
@@ -594,20 +594,20 @@ int inet_getpeername(int sk, inet_prefix *ip, short *port)
594 594
 	return sockaddr_to_inet(sa, ip, port);
595 595
 }
596 596
 
597
-/* 
597
+/*
598 598
  * join_ipv6_multicast: It adds the membership to the IPV6_ADDR_BROADCAST
599
- * multicast group. The device with index `idx' will be used. 
599
+ * multicast group. The device with index `idx' will be used.
600 600
  */
601 601
 int join_ipv6_multicast(int socket, int idx)
602 602
 {
603 603
 	struct ipv6_mreq    mreq6;
604 604
 	const int addr[MAX_IP_INT]=IPV6_ADDR_BROADCAST;
605
-	
605
+
606 606
 	setzero(&mreq6, sizeof(struct ipv6_mreq));
607 607
 	memcpy(&mreq6.ipv6mr_multiaddr,	addr, sizeof(struct in6_addr));
608 608
 	mreq6.ipv6mr_interface=idx;
609
-	
610
-	if(setsockopt(socket, IPPROTO_IPV6, IPV6_JOIN_GROUP, &mreq6, 
609
+
610
+	if(setsockopt(socket, IPPROTO_IPV6, IPV6_JOIN_GROUP, &mreq6,
611 611
 				sizeof(mreq6)) < 0) {
612 612
 		error("Cannot set IPV6_JOIN_GROUP: %s", strerror(errno));
613 613
 	        close(socket);
@@ -631,11 +631,11 @@ int set_multicast_if(int socket, int idx)
631 631
 
632 632
 	return 0;
633 633
 }
634
-		
634
+
635 635
 int set_nonblock_sk(int fd)
636 636
 {
637 637
 	if (fcntl(fd, F_SETFL, O_NONBLOCK) < 0) {
638
-		error("set_nonblock_sk(): cannot set O_NONBLOCK: %s", 
638
+		error("set_nonblock_sk(): cannot set O_NONBLOCK: %s",
639 639
 				strerror(errno));
640 640
 		close(fd);
641 641
 		return -1;
@@ -646,7 +646,7 @@ int set_nonblock_sk(int fd)
646 646
 int unset_nonblock_sk(int fd)
647 647
 {
648 648
 	if (fcntl(fd, F_SETFL, 0) < 0) {
649
-		error("unset_nonblock_sk(): cannot unset O_NONBLOCK: %s", 
649
+		error("unset_nonblock_sk(): cannot unset O_NONBLOCK: %s",
650 650
 				strerror(errno));
651 651
 		close(fd);
652 652
 		return -1;
@@ -671,10 +671,10 @@ int set_bindtodevice_sk(int socket, char *dev)
671 671
 {
672 672
 	struct ifreq ifr;
673 673
 	int ret=0;
674
-	
674
+
675 675
 	setzero(&ifr, sizeof(ifr));
676 676
 	strncpy(ifr.ifr_name, dev, IFNAMSIZ-1);
677
-	
677
+
678 678
 	ret=setsockopt(socket, SOL_SOCKET, SO_BINDTODEVICE, dev, strlen(dev)+1);
679 679
 	if(ret < 0)
680 680
 		error("setsockopt SO_BINDTODEVICE: %s", strerror(errno));
@@ -683,7 +683,7 @@ int set_bindtodevice_sk(int socket, char *dev)
683 683
 }
684 684
 
685 685
 /*
686
- * `loop': 0 = disable, 1 = enable (default) 
686
+ * `loop': 0 = disable, 1 = enable (default)
687 687
  */
688 688
 int set_multicast_loop_sk(int family, int socket, u_char loop)
689 689
 {
@@ -707,7 +707,7 @@ int set_broadcast_sk(int socket, int family, inet_prefix *host, short port,
707 707
 	struct sockaddr	*sa=(struct sockaddr *)&saddr_sto;
708 708
 	socklen_t alen;
709 709
 	int broadcast=1;
710
-	
710
+
711 711
 	if(family == AF_INET) {
712 712
 		if (setsockopt(socket, SOL_SOCKET, SO_BROADCAST, &broadcast,
713 713
 					sizeof(broadcast)) < 0) {
@@ -723,7 +723,7 @@ int set_broadcast_sk(int socket, int family, inet_prefix *host, short port,
723 723
 		set_multicast_if(socket, dev_idx);
724 724
 	} else
725 725
 		fatal(ERROR_MSG "family not supported", ERROR_POS);
726
-	
726
+
727 727
 	/* What's my name ? */
728 728
 	alen = sizeof(saddr_sto);
729 729
 	setzero(sa, alen);
@@ -732,14 +732,14 @@ int set_broadcast_sk(int socket, int family, inet_prefix *host, short port,
732 732
 		close(socket);
733 733
 		return -1;
734 734
 	}
735
-	
735
+
736 736
 	/* Let's bind it! */
737 737
 	if(bind(socket, sa, alen) < 0) {
738 738
 		error("Cannot bind the broadcast socket: %s", strerror(errno));
739 739
 		close(socket);
740 740
 		return -1;
741 741
 	}
742
-	
742
+
743 743
 	return socket;
744 744
 }
745 745
 
@@ -759,7 +759,7 @@ int set_keepalive_sk(int socket)
759 759
 {
760 760
 	int on=1;
761 761
 
762
-	if(setsockopt(socket, SOL_SOCKET, SO_KEEPALIVE, (void *)&on, 
762
+	if(setsockopt(socket, SOL_SOCKET, SO_KEEPALIVE, (void *)&on,
763 763
 				sizeof(on)) < 0){
764 764
 		error("Cannot set keepalive socket: %s", strerror(errno));
765 765
 		return -1;
@@ -771,7 +771,7 @@ int unset_keepalive_sk(int socket)
771 771
 {
772 772
 	int off=0;
773 773
 
774
-	if(setsockopt(socket, SOL_SOCKET, SO_KEEPALIVE, (void *)&off, 
774
+	if(setsockopt(socket, SOL_SOCKET, SO_KEEPALIVE, (void *)&off,
775 775
 				sizeof(off)) < 0){
776 776
 		error("Cannot unset keepalive socket: %s", strerror(errno));
777 777
 		return -1;
@@ -794,7 +794,7 @@ int set_tos_sk(int socket, int lowdelay)
794 794
 
795 795
 /*\
796 796
  *
797
- *   *  *  Connection functions  *  * 
797
+ *   *  *  Connection functions  *  *
798 798
  *
799 799
 \*/
800 800
 
@@ -806,19 +806,19 @@ int new_tcp_conn(inet_prefix *host, short port, char *dev)
806 806
 	struct sockaddr	*sa=(struct sockaddr *)&saddr_sto;
807 807
 	const char *ntop;
808 808
 	ntop=inet_to_str(*host);
809
-	
809
+
810 810
 	if(inet_to_sockaddr(host, port, sa, &sa_len)) {
811 811
 		error("Cannot new_tcp_connect(): %d Family not supported", host->family);
812 812
 		ERROR_FINISH(sk, -1, finish);
813 813
 	}
814
-	
814
+
815 815
 	if((sk = new_socket(host->family)) == -1)
816 816
 		ERROR_FINISH(sk, -1, finish);
817 817
 
818 818
 	if(dev) /* if `dev' is not null bind the socket to it */
819 819
 		if(set_bindtodevice_sk(sk, dev) < 0)
820 820
 			ERROR_FINISH(sk, -1, finish);
821
-	
821
+
822 822
 	if (connect(sk, sa, sa_len) == -1) {
823 823
 		error("Cannot tcp_connect() to %s: %s", ntop, strerror(errno));
824 824
 		ERROR_FINISH(sk, -1, finish);
@@ -828,7 +828,7 @@ finish:
828 828
 }
829 829
 
830 830
 int new_udp_conn(inet_prefix *host, short port, char *dev)
831
-{	
831
+{
832 832
 	int sk;
833 833
 	socklen_t sa_len;
834 834
 	struct sockaddr_storage saddr_sto;
@@ -841,9 +841,9 @@ int new_udp_conn(inet_prefix *host, short port, char *dev)
841 841
 		ERROR_FINISH(sk, -1, finish);
842 842
 	}
843 843
 
844
-	if((sk = new_dgram_socket(host->family)) == -1) 
844
+	if((sk = new_dgram_socket(host->family)) == -1)
845 845
 		ERROR_FINISH(sk, -1, finish);
846
-	
846
+
847 847
 	if(dev) /* if `dev' is not null bind the socket to it */
848 848
 		if(set_bindtodevice_sk(sk, dev) < 0)
849 849
 			ERROR_FINISH(sk, -1, finish);
@@ -852,13 +852,13 @@ int new_udp_conn(inet_prefix *host, short port, char *dev)
852 852
 		error("Cannot connect to %s: %s", ntop, strerror(errno));
853 853
 		ERROR_FINISH(sk, -1, finish);
854 854
 	}
855
-	
855
+
856 856
 finish:
857 857
 	return sk;
858 858
 }
859
-	
859
+
860 860
 int new_bcast_conn(inet_prefix *host, short port, int dev_idx)
861
-{	
861
+{
862 862
 	struct sockaddr_storage saddr_sto;
863 863
 	struct sockaddr	*sa=(struct sockaddr *)&saddr_sto;
864 864
 	socklen_t alen;
@@ -868,26 +868,26 @@ int new_bcast_conn(inet_prefix *host, short port, int dev_idx)
868 868
 	if((sk = new_dgram_socket(host->family)) == -1)
869 869
 		return -1;
870 870
 	sk=set_broadcast_sk(sk, host->family, host, port, dev_idx);
871
-	
871
+
872 872
 	/*
873
-	 * Connect 
873
+	 * Connect
874 874
 	 */
875 875
 	if(inet_to_sockaddr(host, port, sa, &alen)) {
876 876
 		error("set_broadcast_sk: %d Family not supported", host->family);
877 877
 		return -1;
878 878
 	}
879
-	
879
+
880 880
 	if(host->family == AF_INET6) {
881 881
 		struct sockaddr_in6 *sin6=(struct sockaddr_in6 *)sa;
882 882
 		sin6->sin6_scope_id = dev_idx;
883 883
 	}
884
-	
884
+
885 885
 	if(set_bindtodevice_sk(sk, (char *)ll_index_to_name(dev_idx)) < 0)
886 886
 		return -1;
887
-	
887
+
888 888
 	if(connect(sk, sa, alen) == -1) {
889 889
 		ntop=inet_to_str(*host);
890
-		error("Cannot connect to the broadcast (%s): %s", ntop,	
890
+		error("Cannot connect to the broadcast (%s): %s", ntop,
891 891
 				strerror(errno));
892 892
 		return -1;
893 893
 	}
@@ -909,7 +909,7 @@ ssize_t inet_recv(int s, void *buf, size_t len, int flags)
909 909
 	int ret;
910 910
 
911 911
 	if((err=recv(s, buf, len, flags))==-1) {
912
-		switch(errno) 
912
+		switch(errno)
913 913
 		{
914 914
 			default:
915 915
 				/* Probably connection was closed */
@@ -922,9 +922,9 @@ ssize_t inet_recv(int s, void *buf, size_t len, int flags)
922 922
 	return err;
923 923
 }
924 924
 
925
-/* 
925
+/*
926 926
  * inet_recv_timeout
927
- * 
927
+ *
928 928
  * is the same as inet_recv() but if no reply is received for `timeout'
929 929
  * seconds it returns -1.
930 930
  */
@@ -955,7 +955,7 @@ ssize_t inet_recvfrom(int s, void *buf, size_t len, int flags, struct sockaddr *
955 955
 	int ret;
956 956
 
957 957
 	if((err=recvfrom(s, buf, len, flags, from, fromlen)) < 0) {
958
-		switch(errno) 
958
+		switch(errno)
959 959
 		{
960 960
 			default:
961 961
 				error("inet_recvfrom: Cannot recv(): %s", strerror(errno));
@@ -966,11 +966,11 @@ ssize_t inet_recvfrom(int s, void *buf, size_t len, int flags, struct sockaddr *
966 966
 	return err;
967 967
 }
968 968
 
969
-/* 
969
+/*
970 970
  * inet_recvfrom_timeout: is the same as inet_recvfrom() but if no reply is
971 971
  * received for `timeout' seconds it returns -1.
972 972
  */
973
-ssize_t inet_recvfrom_timeout(int s, void *buf, size_t len, int flags, 
973
+ssize_t inet_recvfrom_timeout(int s, void *buf, size_t len, int flags,
974 974
 		struct sockaddr *from, socklen_t *fromlen, u_int timeout)
975 975
 {
976 976
 	struct timeval timeout_t;
@@ -990,10 +990,10 @@ ssize_t inet_recvfrom_timeout(int s, void *buf, size_t len, int flags,
990 990
 
991 991
 	if(FD_ISSET(s, &fdset))
992 992
 		return inet_recvfrom(s, buf, len, flags, from, fromlen);
993
-	
993
+
994 994
 	return -1;
995 995
 }
996
-			
996
+
997 997
 ssize_t inet_send(int s, const void *msg, size_t len, int flags)
998 998
 {
999 999
 	ssize_t err;
@@ -1001,11 +1001,11 @@ ssize_t inet_send(int s, const void *msg, size_t len, int flags)
1001 1001
 	int ret;
1002 1002
 
1003 1003
 	if((err=send(s, msg, len, flags)) < 0) {
1004
-		switch(errno) 
1004
+		switch(errno)
1005 1005
 		{
1006 1006
 			case EMSGSIZE:
1007 1007
 				inet_send(s, msg, len/2, flags);
1008
-				err=inet_send(s, (const char *)msg+(len/2), 
1008
+				err=inet_send(s, (const char *)msg+(len/2),
1009 1009
 						len-(len/2), flags);
1010 1010
 				break;
1011 1011
 
@@ -1029,7 +1029,7 @@ ssize_t inet_send_timeout(int s, const void *msg, size_t len, int flags, u_int t
1029 1029
 	int ret;
1030 1030
 
1031 1031
 	MILLISEC_TO_TV(timeout*1000, timeout_t);
1032
-	
1032
+
1033 1033
 	FD_ZERO(&fdset);
1034 1034
 	FD_SET(s, &fdset);
1035 1035
 
@@ -1047,14 +1047,14 @@ ssize_t inet_send_timeout(int s, const void *msg, size_t len, int flags, u_int t
1047 1047
 
1048 1048
 
1049 1049
 
1050
-ssize_t inet_sendto(int s, const void *msg, size_t len, int flags, 
1050
+ssize_t inet_sendto(int s, const void *msg, size_t len, int flags,
1051 1051
 		const struct sockaddr *to, socklen_t tolen)
1052 1052
 {
1053 1053
 	ssize_t err;
1054 1054
 	fd_set fdset;
1055 1055
 	int ret;
1056 1056
 	int errno_int;
1057
-	
1057
+
1058 1058
 	if((err=sendto(s, msg, len, flags, to, tolen))==-1) {
1059 1059
 		errno_int = errno;
1060 1060
 		error("sendto errno: %d err is: %d", errno, err);
@@ -1063,7 +1063,7 @@ ssize_t inet_sendto(int s, const void *msg, size_t len, int flags,
1063 1063
 			case EMSGSIZE:
1064 1064
 			error("Packet artificially fragmented: %d", stderr);
1065 1065
 				inet_sendto(s, msg, len/2, flags, to, tolen);
1066
-				err=inet_sendto(s, ((const char *)msg+(len/2)), 
1066
+				err=inet_sendto(s, ((const char *)msg+(len/2)),
1067 1067
 						len-(len/2), flags, to, tolen);
1068 1068
 				break;
1069 1069
 			case EFAULT:
@@ -1081,7 +1081,7 @@ ssize_t inet_sendto(int s, const void *msg, size_t len, int flags,
1081 1081
  * inet_sendto_timeout: is the same as inet_sendto() but if the packet isn't sent
1082 1082
  * in `timeout' seconds it timeouts and returns -1.
1083 1083
  */
1084
-ssize_t inet_sendto_timeout(int s, const void *msg, size_t len, int flags, 
1084
+ssize_t inet_sendto_timeout(int s, const void *msg, size_t len, int flags,
1085 1085
 		const struct sockaddr *to, socklen_t tolen, u_int timeout)
1086 1086
 {
1087 1087
 	struct timeval timeout_t;
@@ -1089,7 +1089,7 @@ ssize_t inet_sendto_timeout(int s, const void *msg, size_t len, int flags,
1089 1089
 	int ret;
1090 1090
 
1091 1091
 	MILLISEC_TO_TV(timeout*1000, timeout_t);
1092
-	
1092
+
1093 1093
 	FD_ZERO(&fdset);
1094 1094
 	FD_SET(s, &fdset);
1095 1095
 

+ 2
- 0
src/libiptc/libiptc.c View File

@@ -509,6 +509,7 @@ new_rule:
509 509
 			t = (STRUCT_STANDARD_TARGET *)GET_TARGET(e);
510 510
 			if (t->target.u.target_size
511 511
 			    != ALIGN(sizeof(STRUCT_STANDARD_TARGET))) {
512
+				free(r);
512 513
 				errno = EINVAL;
513 514
 				return -1;
514 515
 			}
@@ -2120,6 +2121,7 @@ TC_COMMIT(TC_HANDLE_T *handle)
2120 2121
 		errno = ret;
2121 2122
 		free(repl->counters);
2122 2123
 		free(repl);
2124
+		free(newcounters);
2123 2125
 		return 0;
2124 2126
 	}
2125 2127
 

+ 274
- 143
src/man/Makefile.in View File

@@ -1,8 +1,8 @@
1
-# Makefile.in generated by automake 1.8.5 from Makefile.am.
1
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5
-# 2003, 2004  Free Software Foundation, Inc.
4
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
5
+
6 6
 # This Makefile.in is free software; the Free Software Foundation
7 7
 # gives unlimited permission to copy and/or distribute it,
8 8
 # with or without modifications, as long as this notice is preserved.
@@ -13,15 +13,57 @@
13 13
 # PARTICULAR PURPOSE.
14 14
 
15 15
 @SET_MAKE@
16
-srcdir = @srcdir@
17
-top_srcdir = @top_srcdir@
18 16
 VPATH = @srcdir@
17
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
18
+am__make_running_with_option = \
19
+  case $${target_option-} in \
20
+      ?) ;; \
21
+      *) echo "am__make_running_with_option: internal error: invalid" \
22
+              "target option '$${target_option-}' specified" >&2; \
23
+         exit 1;; \
24
+  esac; \
25
+  has_opt=no; \
26
+  sane_makeflags=$$MAKEFLAGS; \
27
+  if $(am__is_gnu_make); then \
28
+    sane_makeflags=$$MFLAGS; \
29
+  else \
30
+    case $$MAKEFLAGS in \
31
+      *\\[\ \	]*) \
32
+        bs=\\; \
33
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
34
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
35
+    esac; \
36
+  fi; \
37
+  skip_next=no; \
38
+  strip_trailopt () \
39
+  { \
40
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
41
+  }; \
42
+  for flg in $$sane_makeflags; do \
43
+    test $$skip_next = yes && { skip_next=no; continue; }; \
44
+    case $$flg in \
45
+      *=*|--*) continue;; \
46
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
47
+      -*I?*) strip_trailopt 'I';; \
48
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
49
+      -*O?*) strip_trailopt 'O';; \
50
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
51
+      -*l?*) strip_trailopt 'l';; \
52
+      -[dEDm]) skip_next=yes;; \
53
+      -[JT]) skip_next=yes;; \
54
+    esac; \
55
+    case $$flg in \
56
+      *$$target_option*) has_opt=yes; break;; \
57
+    esac; \
58
+  done; \
59
+  test $$has_opt = yes
60
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
61
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
19 62
 pkgdatadir = $(datadir)/@PACKAGE@
20
-pkglibdir = $(libdir)/@PACKAGE@
21 63
 pkgincludedir = $(includedir)/@PACKAGE@
22
-top_builddir = ../..
64
+pkglibdir = $(libdir)/@PACKAGE@
65
+pkglibexecdir = $(libexecdir)/@PACKAGE@
23 66
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
24
-INSTALL = @INSTALL@
25 67
 install_sh_DATA = $(install_sh) -c -m 644
26 68
 install_sh_PROGRAM = $(install_sh) -c
27 69
 install_sh_SCRIPT = $(install_sh) -c
@@ -33,28 +75,74 @@ POST_INSTALL = :
33 75
 NORMAL_UNINSTALL = :
34 76
 PRE_UNINSTALL = :
35 77
 POST_UNINSTALL = :
78
+build_triplet = @build@
36 79
 host_triplet = @host@
37 80
 subdir = src/man
38
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
81
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
39 82
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
40 83
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
41 84
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
42 85
 	$(ACLOCAL_M4)
43
-mkinstalldirs = $(mkdir_p)
86
+mkinstalldirs = $(install_sh) -d
44 87
 CONFIG_HEADER = $(top_builddir)/src/config.h
45 88
 CONFIG_CLEAN_FILES =
89
+CONFIG_CLEAN_VPATH_FILES =
90
+AM_V_P = $(am__v_P_@AM_V@)
91
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
92
+am__v_P_0 = false
93
+am__v_P_1 = :
94
+AM_V_GEN = $(am__v_GEN_@AM_V@)
95
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
96
+am__v_GEN_0 = @echo "  GEN     " $@;
97
+am__v_GEN_1 = 
98
+AM_V_at = $(am__v_at_@AM_V@)
99
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
100
+am__v_at_0 = @
101
+am__v_at_1 = 
46 102
 SOURCES =
47 103
 DIST_SOURCES =
104
+am__can_run_installinfo = \
105
+  case $$AM_UPDATE_INFO_DIR in \
106
+    n|no|NO) false;; \
107
+    *) (install-info --version) >/dev/null 2>&1;; \
108
+  esac
109
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
110
+am__vpath_adj = case $$p in \
111
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
112
+    *) f=$$p;; \
113
+  esac;
114
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
115
+am__install_max = 40
116
+am__nobase_strip_setup = \
117
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
118
+am__nobase_strip = \
119
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
120
+am__nobase_list = $(am__nobase_strip_setup); \
121
+  for p in $$list; do echo "$$p $$p"; done | \
122
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
123
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
124
+    if (++n[$$2] == $(am__install_max)) \
125
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
126
+    END { for (dir in files) print dir, files[dir] }'
127
+am__base_list = \
128
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
129
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
130
+am__uninstall_files_from_dir = { \
131
+  test -z "$$files" \
132
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
133
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
134
+         $(am__cd) "$$dir" && rm -f $$files; }; \
135
+  }
48 136
 man5dir = $(mandir)/man5
49 137
 am__installdirs = "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)"
50 138
 man8dir = $(mandir)/man8
51 139
 NROFF = nroff
52 140
 MANS = $(man5_MANS) $(man8_MANS)
141
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
53 142
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
54 143
 ACLOCAL = @ACLOCAL@
55
-AMDEP_FALSE = @AMDEP_FALSE@
56
-AMDEP_TRUE = @AMDEP_TRUE@
57 144
 AMTAR = @AMTAR@
145
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
58 146
 AUTOCONF = @AUTOCONF@
59 147
 AUTOHEADER = @AUTOHEADER@
60 148
 AUTOMAKE = @AUTOMAKE@
@@ -77,7 +165,9 @@ ECHO_N = @ECHO_N@
77 165
 ECHO_T = @ECHO_T@
78 166
 EGREP = @EGREP@
79 167
 EXEEXT = @EXEEXT@
168
+GREP = @GREP@
80 169
 IF_METHOD = @IF_METHOD@
170
+INSTALL = @INSTALL@
81 171
 INSTALL_DATA = @INSTALL_DATA@
82 172
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
83 173
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -88,6 +178,7 @@ LIBOBJS = @LIBOBJS@
88 178
 LIBS = @LIBS@
89 179
 LTLIBOBJS = @LTLIBOBJS@
90 180
 MAKEINFO = @MAKEINFO@
181
+MKDIR_P = @MKDIR_P@
91 182
 OBJEXT = @OBJEXT@
92 183
 OTHER_METHOD = @OTHER_METHOD@
93 184
 PACKAGE = @PACKAGE@
@@ -95,6 +186,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
95 186
 PACKAGE_NAME = @PACKAGE_NAME@
96 187
 PACKAGE_STRING = @PACKAGE_STRING@
97 188
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
189
+PACKAGE_URL = @PACKAGE_URL@
98 190
 PACKAGE_VERSION = @PACKAGE_VERSION@
99 191
 PATH_SEPARATOR = @PATH_SEPARATOR@
100 192
 PID_DIR = @PID_DIR@
@@ -103,24 +195,29 @@ SET_MAKE = @SET_MAKE@
103 195
 SHELL = @SHELL@
104 196
 STRIP = @STRIP@
105 197
 VERSION = @VERSION@
198
+abs_builddir = @abs_builddir@
199
+abs_srcdir = @abs_srcdir@
200
+abs_top_builddir = @abs_top_builddir@
201
+abs_top_srcdir = @abs_top_srcdir@
106 202
 ac_ct_CC = @ac_ct_CC@
107 203
 ac_ct_CXX = @ac_ct_CXX@
108
-ac_ct_STRIP = @ac_ct_STRIP@
109
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
110
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
111
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
112
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
113 204
 am__include = @am__include@
114 205
 am__leading_dot = @am__leading_dot@
115 206
 am__quote = @am__quote@
207
+am__tar = @am__tar@
208
+am__untar = @am__untar@
116 209
 bindir = @bindir@
117 210
 build = @build@
118 211
 build_alias = @build_alias@
119 212
 build_cpu = @build_cpu@
120 213
 build_os = @build_os@
121 214
 build_vendor = @build_vendor@
215
+builddir = @builddir@
122 216
 datadir = @datadir@
217
+datarootdir = @datarootdir@
123 218
 debug_flags = @debug_flags@
219
+docdir = @docdir@
220
+dvidir = @dvidir@
124 221
 exec_prefix = @exec_prefix@
125 222
 gmp = @gmp@
126 223
 host = @host@
@@ -128,21 +225,29 @@ host_alias = @host_alias@
128 225
 host_cpu = @host_cpu@
129 226
 host_os = @host_os@
130 227
 host_vendor = @host_vendor@
228
+htmldir = @htmldir@
131 229
 includedir = @includedir@
132 230
 infodir = @infodir@
133 231
 install_sh = @install_sh@
134 232
 libdir = @libdir@
135 233
 libexecdir = @libexecdir@
234
+localedir = @localedir@
136 235
 localstatedir = @localstatedir@
137 236
 mandir = @mandir@
138 237
 mkdir_p = @mkdir_p@
139 238
 oldincludedir = @oldincludedir@
239
+pdfdir = @pdfdir@
140 240
 prefix = @prefix@
141 241
 program_transform_name = @program_transform_name@
242
+psdir = @psdir@
142 243
 sbindir = @sbindir@
143 244
 sharedstatedir = @sharedstatedir@
245
+srcdir = @srcdir@
144 246
 sysconfdir = @sysconfdir@
145 247
 target_alias = @target_alias@
248
+top_build_prefix = @top_build_prefix@
249
+top_builddir = @top_builddir@
250
+top_srcdir = @top_srcdir@
146 251
 man8_MANS = andna.8 ntkd.8 ntk-wifi.8 ntk-resolv.8 netsukuku.conf.5
147 252
 man5_MANS = netsukuku.conf.5
148 253
 all: all-am
@@ -152,14 +257,14 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
152 257
 	@for dep in $?; do \
153 258
 	  case '$(am__configure_deps)' in \
154 259
 	    *$$dep*) \
155
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
156
-		&& exit 0; \
260
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
261
+	        && { if test -f $@; then exit 0; else break; fi; }; \
157 262
 	      exit 1;; \
158 263
 	  esac; \
159 264
 	done; \
160
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/man/Makefile'; \
161
-	cd $(top_srcdir) && \
162
-	  $(AUTOMAKE) --gnu  src/man/Makefile
265
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/man/Makefile'; \
266
+	$(am__cd) $(top_srcdir) && \
267
+	  $(AUTOMAKE) --gnu src/man/Makefile
163 268
 .PRECIOUS: Makefile
164 269
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
165 270
 	@case '$?' in \
@@ -177,128 +282,123 @@ $(top_srcdir)/configure:  $(am__configure_deps)
177 282
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
178 283
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
179 284
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
180
-uninstall-info-am:
181
-install-man5: $(man5_MANS) $(man_MANS)
285
+$(am__aclocal_m4_deps):
286
+install-man5: $(man5_MANS)
182 287
 	@$(NORMAL_INSTALL)
183
-	test -z "$(man5dir)" || $(mkdir_p) "$(DESTDIR)$(man5dir)"
184
-	@list='$(man5_MANS) $(dist_man5_MANS) $(nodist_man5_MANS)'; \
185
-	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
186
-	for i in $$l2; do \
187
-	  case "$$i" in \
188
-	    *.5*) list="$$list $$i" ;; \
189
-	  esac; \
288
+	@list1='$(man5_MANS)'; \
289
+	list2=''; \
290
+	test -n "$(man5dir)" \
291
+	  && test -n "`echo $$list1$$list2`" \
292
+	  || exit 0; \
293
+	echo " $(MKDIR_P) '$(DESTDIR)$(man5dir)'"; \
294
+	$(MKDIR_P) "$(DESTDIR)$(man5dir)" || exit 1; \
295
+	{ for i in $$list1; do echo "$$i"; done;  \
296
+	if test -n "$$list2"; then \
297
+	  for i in $$list2; do echo "$$i"; done \
298
+	    | sed -n '/\.5[a-z]*$$/p'; \
299
+	fi; \
300
+	} | while read p; do \
301
+	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
302
+	  echo "$$d$$p"; echo "$$p"; \
303
+	done | \
304
+	sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^5][0-9a-z]*$$,5,;x' \
305
+	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
306
+	sed 'N;N;s,\n, ,g' | { \
307
+	list=; while read file base inst; do \
308
+	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
309
+	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man5dir)/$$inst'"; \
310
+	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man5dir)/$$inst" || exit $$?; \
311
+	  fi; \
190 312
 	done; \
191
-	for i in $$list; do \
192
-	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
193
-	  else file=$$i; fi; \
194
-	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
195
-	  case "$$ext" in \
196
-	    5*) ;; \
197
-	    *) ext='5' ;; \
198
-	  esac; \
199
-	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
200
-	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
201
-	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
202
-	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man5dir)/$$inst'"; \
203
-	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man5dir)/$$inst"; \
204
-	done
313
+	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
314
+	while read files; do \
315
+	  test -z "$$files" || { \
316
+	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man5dir)'"; \
317
+	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man5dir)" || exit $$?; }; \
318
+	done; }
319
+
205 320
 uninstall-man5:
206 321
 	@$(NORMAL_UNINSTALL)
207
-	@list='$(man5_MANS) $(dist_man5_MANS) $(nodist_man5_MANS)'; \
208
-	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
209
-	for i in $$l2; do \
210
-	  case "$$i" in \
211
-	    *.5*) list="$$list $$i" ;; \
212
-	  esac; \
213
-	done; \
214
-	for i in $$list; do \
215
-	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
216
-	  case "$$ext" in \
217
-	    5*) ;; \
218
-	    *) ext='5' ;; \
219
-	  esac; \
220
-	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
221
-	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
222
-	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
223
-	  echo " rm -f '$(DESTDIR)$(man5dir)/$$inst'"; \
224
-	  rm -f "$(DESTDIR)$(man5dir)/$$inst"; \
225
-	done
226
-install-man8: $(man8_MANS) $(man_MANS)
322
+	@list='$(man5_MANS)'; test -n "$(man5dir)" || exit 0; \
323
+	files=`{ for i in $$list; do echo "$$i"; done; \
324
+	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^5][0-9a-z]*$$,5,;x' \
325
+	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
326
+	dir='$(DESTDIR)$(man5dir)'; $(am__uninstall_files_from_dir)
327
+install-man8: $(man8_MANS)
227 328
 	@$(NORMAL_INSTALL)
228
-	test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
229
-	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
230
-	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
231
-	for i in $$l2; do \
232
-	  case "$$i" in \
233
-	    *.8*) list="$$list $$i" ;; \
234
-	  esac; \
329
+	@list1='$(man8_MANS)'; \
330
+	list2=''; \
331
+	test -n "$(man8dir)" \
332
+	  && test -n "`echo $$list1$$list2`" \
333
+	  || exit 0; \
334
+	echo " $(MKDIR_P) '$(DESTDIR)$(man8dir)'"; \
335
+	$(MKDIR_P) "$(DESTDIR)$(man8dir)" || exit 1; \
336
+	{ for i in $$list1; do echo "$$i"; done;  \
337
+	if test -n "$$list2"; then \
338
+	  for i in $$list2; do echo "$$i"; done \
339
+	    | sed -n '/\.8[a-z]*$$/p'; \
340
+	fi; \
341
+	} | while read p; do \
342
+	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
343
+	  echo "$$d$$p"; echo "$$p"; \
344
+	done | \
345
+	sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
346
+	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
347
+	sed 'N;N;s,\n, ,g' | { \
348
+	list=; while read file base inst; do \
349
+	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
350
+	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
351
+	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst" || exit $$?; \
352
+	  fi; \
235 353
 	done; \
236
-	for i in $$list; do \
237
-	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
238
-	  else file=$$i; fi; \
239
-	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
240
-	  case "$$ext" in \
241
-	    8*) ;; \
242
-	    *) ext='8' ;; \
243
-	  esac; \
244
-	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
245
-	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
246
-	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
247
-	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
248
-	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
249
-	done
354
+	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
355
+	while read files; do \
356
+	  test -z "$$files" || { \
357
+	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man8dir)'"; \
358
+	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man8dir)" || exit $$?; }; \
359
+	done; }
360
+
250 361
 uninstall-man8:
251 362
 	@$(NORMAL_UNINSTALL)
252
-	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
253
-	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
254
-	for i in $$l2; do \
255
-	  case "$$i" in \
256
-	    *.8*) list="$$list $$i" ;; \
257
-	  esac; \
258
-	done; \
259
-	for i in $$list; do \
260
-	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
261
-	  case "$$ext" in \
262
-	    8*) ;; \
263
-	    *) ext='8' ;; \
264
-	  esac; \
265
-	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
266
-	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
267
-	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
268
-	  echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \
269
-	  rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
270
-	done
271
-tags: TAGS
272
-TAGS:
363
+	@list='$(man8_MANS)'; test -n "$(man8dir)" || exit 0; \
364
+	files=`{ for i in $$list; do echo "$$i"; done; \
365
+	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
366
+	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
367
+	dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir)
368
+tags TAGS:
369
+
370
+ctags CTAGS:
273 371
 
274
-ctags: CTAGS
275
-CTAGS:
372
+cscope cscopelist:
276 373
 
277 374
 
278 375
 distdir: $(DISTFILES)
279
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
280
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
281
-	list='$(DISTFILES)'; for file in $$list; do \
282
-	  case $$file in \
283
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
284
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
285
-	  esac; \
376
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
377
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
378
+	list='$(DISTFILES)'; \
379
+	  dist_files=`for file in $$list; do echo $$file; done | \
380
+	  sed -e "s|^$$srcdirstrip/||;t" \
381
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
382
+	case $$dist_files in \
383
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
384
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
385
+			   sort -u` ;; \
386
+	esac; \
387
+	for file in $$dist_files; do \
286 388
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
287
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
288
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
289
-	    dir="/$$dir"; \
290
-	    $(mkdir_p) "$(distdir)$$dir"; \
291
-	  else \
292
-	    dir=''; \
293
-	  fi; \
294 389
 	  if test -d $$d/$$file; then \
390
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
391
+	    if test -d "$(distdir)/$$file"; then \
392
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
393
+	    fi; \
295 394
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
296
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
395
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
396
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
297 397
 	    fi; \
298
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
398
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
299 399
 	  else \
300
-	    test -f $(distdir)/$$file \
301
-	    || cp -p $$d/$$file $(distdir)/$$file \
400
+	    test -f "$(distdir)/$$file" \
401
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
302 402
 	    || exit 1; \
303 403
 	  fi; \
304 404
 	done
@@ -307,7 +407,7 @@ check: check-am
307 407
 all-am: Makefile $(MANS)
308 408
 installdirs:
309 409
 	for dir in "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)"; do \
310
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
410
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
311 411
 	done
312 412
 install: install-am
313 413
 install-exec: install-exec-am
@@ -319,16 +419,22 @@ install-am: all-am
319 419
 
320 420
 installcheck: installcheck-am
321 421
 install-strip:
322
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
323
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
324
-	  `test -z '$(STRIP)' || \
325
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
422
+	if test -z '$(STRIP)'; then \
423
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
424
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
425
+	      install; \
426
+	else \
427
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
428
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
429
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
430
+	fi
326 431
 mostlyclean-generic:
327 432
 
328 433
 clean-generic:
329 434
 
330 435
 distclean-generic:
331
-	-rm -f $(CONFIG_CLEAN_FILES)
436
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
437
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
332 438
 
333 439
 maintainer-clean-generic:
334 440
 	@echo "This command is intended for maintainers to use"
@@ -347,18 +453,38 @@ dvi-am:
347 453
 
348 454
 html: html-am
349 455
 
456
+html-am:
457
+
350 458
 info: info-am
351 459
 
352 460
 info-am:
353 461
 
354 462
 install-data-am: install-man
355 463
 
464
+install-dvi: install-dvi-am
465
+
466
+install-dvi-am:
467
+
356 468
 install-exec-am:
357 469
 
470
+install-html: install-html-am
471
+
472
+install-html-am:
473
+
358 474
 install-info: install-info-am
359 475
 
476
+install-info-am:
477
+
360 478
 install-man: install-man5 install-man8
361 479
 
480
+install-pdf: install-pdf-am
481
+
482
+install-pdf-am:
483
+
484
+install-ps: install-ps-am
485
+
486
+install-ps-am:
487
+
362 488
 installcheck-am:
363 489
 
364 490
 maintainer-clean: maintainer-clean-am
@@ -377,19 +503,24 @@ ps: ps-am
377 503
 
378 504
 ps-am:
379 505
 
380
-uninstall-am: uninstall-info-am uninstall-man
506
+uninstall-am: uninstall-man
381 507
 
382 508
 uninstall-man: uninstall-man5 uninstall-man8
383 509
 
384
-.PHONY: all all-am check check-am clean clean-generic distclean \
385
-	distclean-generic distdir dvi dvi-am html html-am info info-am \
386
-	install install-am install-data install-data-am install-exec \
387
-	install-exec-am install-info install-info-am install-man \
388
-	install-man5 install-man8 install-strip installcheck \
389
-	installcheck-am installdirs maintainer-clean \
390
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
391
-	pdf-am ps ps-am uninstall uninstall-am uninstall-info-am \
392
-	uninstall-man uninstall-man5 uninstall-man8
510
+.MAKE: install-am install-strip
511
+
512
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
513
+	ctags-am distclean distclean-generic distdir dvi dvi-am html \
514
+	html-am info info-am install install-am install-data \
515
+	install-data-am install-dvi install-dvi-am install-exec \
516
+	install-exec-am install-html install-html-am install-info \
517
+	install-info-am install-man install-man5 install-man8 \
518
+	install-pdf install-pdf-am install-ps install-ps-am \
519
+	install-strip installcheck installcheck-am installdirs \
520
+	maintainer-clean maintainer-clean-generic mostlyclean \
521
+	mostlyclean-generic pdf pdf-am ps ps-am tags-am uninstall \
522
+	uninstall-am uninstall-man uninstall-man5 uninstall-man8
523
+
393 524
 
394 525
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
395 526
 # Otherwise a system limit (for SysV at least) may be exceeded.

+ 260
- 92
src/scripts/Makefile.in View File

@@ -1,8 +1,8 @@
1
-# Makefile.in generated by automake 1.8.5 from Makefile.am.
1
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5
-# 2003, 2004  Free Software Foundation, Inc.
4
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
5
+
6 6
 # This Makefile.in is free software; the Free Software Foundation
7 7
 # gives unlimited permission to copy and/or distribute it,
8 8
 # with or without modifications, as long as this notice is preserved.
@@ -14,15 +14,57 @@
14 14
 
15 15
 @SET_MAKE@
16 16
 
17
-srcdir = @srcdir@
18
-top_srcdir = @top_srcdir@
19 17
 VPATH = @srcdir@
18
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
19
+am__make_running_with_option = \
20
+  case $${target_option-} in \
21
+      ?) ;; \
22
+      *) echo "am__make_running_with_option: internal error: invalid" \
23
+              "target option '$${target_option-}' specified" >&2; \
24
+         exit 1;; \
25
+  esac; \
26
+  has_opt=no; \
27
+  sane_makeflags=$$MAKEFLAGS; \
28
+  if $(am__is_gnu_make); then \
29
+    sane_makeflags=$$MFLAGS; \
30
+  else \
31
+    case $$MAKEFLAGS in \
32
+      *\\[\ \	]*) \
33
+        bs=\\; \
34
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
35
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
36
+    esac; \
37
+  fi; \
38
+  skip_next=no; \
39
+  strip_trailopt () \
40
+  { \
41
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
42
+  }; \
43
+  for flg in $$sane_makeflags; do \
44
+    test $$skip_next = yes && { skip_next=no; continue; }; \
45
+    case $$flg in \
46
+      *=*|--*) continue;; \
47
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
48
+      -*I?*) strip_trailopt 'I';; \
49
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
50
+      -*O?*) strip_trailopt 'O';; \
51
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
52
+      -*l?*) strip_trailopt 'l';; \
53
+      -[dEDm]) skip_next=yes;; \
54
+      -[JT]) skip_next=yes;; \
55
+    esac; \
56
+    case $$flg in \
57
+      *$$target_option*) has_opt=yes; break;; \
58
+    esac; \
59
+  done; \
60
+  test $$has_opt = yes
61
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
62
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
20 63
 pkgdatadir = $(datadir)/@PACKAGE@
21
-pkglibdir = $(libdir)/@PACKAGE@
22 64
 pkgincludedir = $(includedir)/@PACKAGE@
23
-top_builddir = ../..
65
+pkglibdir = $(libdir)/@PACKAGE@
66
+pkglibexecdir = $(libexecdir)/@PACKAGE@
24 67
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
25
-INSTALL = @INSTALL@
26 68
 install_sh_DATA = $(install_sh) -c -m 644
27 69
 install_sh_PROGRAM = $(install_sh) -c
28 70
 install_sh_SCRIPT = $(install_sh) -c
@@ -34,27 +76,71 @@ POST_INSTALL = :
34 76
 NORMAL_UNINSTALL = :
35 77
 PRE_UNINSTALL = :
36 78
 POST_UNINSTALL = :
79
+build_triplet = @build@
37 80
 host_triplet = @host@
38 81
 subdir = src/scripts
39
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
82
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
40 83
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
41 84
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
42 85
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
43 86
 	$(ACLOCAL_M4)
44
-mkinstalldirs = $(mkdir_p)
87
+mkinstalldirs = $(install_sh) -d
45 88
 CONFIG_HEADER = $(top_builddir)/src/config.h
46 89
 CONFIG_CLEAN_FILES =
90
+CONFIG_CLEAN_VPATH_FILES =
91
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
92
+am__vpath_adj = case $$p in \
93
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
94
+    *) f=$$p;; \
95
+  esac;
96
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
97
+am__install_max = 40
98
+am__nobase_strip_setup = \
99
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
100
+am__nobase_strip = \
101
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
102
+am__nobase_list = $(am__nobase_strip_setup); \
103
+  for p in $$list; do echo "$$p $$p"; done | \
104
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
105
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
106
+    if (++n[$$2] == $(am__install_max)) \
107
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
108
+    END { for (dir in files) print dir, files[dir] }'
109
+am__base_list = \
110
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
111
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
112
+am__uninstall_files_from_dir = { \
113
+  test -z "$$files" \
114
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
115
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
116
+         $(am__cd) "$$dir" && rm -f $$files; }; \
117
+  }
47 118
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(scriptconfdir)"
48
-binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
49
-scriptconfSCRIPT_INSTALL = $(INSTALL_SCRIPT)
50 119
 SCRIPTS = $(bin_SCRIPTS) $(scriptconf_SCRIPTS)
120
+AM_V_P = $(am__v_P_@AM_V@)
121
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
122
+am__v_P_0 = false
123
+am__v_P_1 = :
124
+AM_V_GEN = $(am__v_GEN_@AM_V@)
125
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
126
+am__v_GEN_0 = @echo "  GEN     " $@;
127
+am__v_GEN_1 = 
128
+AM_V_at = $(am__v_at_@AM_V@)
129
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
130
+am__v_at_0 = @
131
+am__v_at_1 = 
51 132
 SOURCES =
52 133
 DIST_SOURCES =
134
+am__can_run_installinfo = \
135
+  case $$AM_UPDATE_INFO_DIR in \
136
+    n|no|NO) false;; \
137
+    *) (install-info --version) >/dev/null 2>&1;; \
138
+  esac
139
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
53 140
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
54 141
 ACLOCAL = @ACLOCAL@
55
-AMDEP_FALSE = @AMDEP_FALSE@
56
-AMDEP_TRUE = @AMDEP_TRUE@
57 142
 AMTAR = @AMTAR@
143
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
58 144
 AUTOCONF = @AUTOCONF@
59 145
 AUTOHEADER = @AUTOHEADER@
60 146
 AUTOMAKE = @AUTOMAKE@
@@ -77,7 +163,9 @@ ECHO_N = @ECHO_N@
77 163
 ECHO_T = @ECHO_T@
78 164
 EGREP = @EGREP@
79 165
 EXEEXT = @EXEEXT@
166
+GREP = @GREP@
80 167
 IF_METHOD = @IF_METHOD@
168
+INSTALL = @INSTALL@
81 169
 INSTALL_DATA = @INSTALL_DATA@
82 170
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
83 171
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -88,6 +176,7 @@ LIBOBJS = @LIBOBJS@
88 176
 LIBS = @LIBS@
89 177
 LTLIBOBJS = @LTLIBOBJS@
90 178
 MAKEINFO = @MAKEINFO@
179
+MKDIR_P = @MKDIR_P@
91 180
 OBJEXT = @OBJEXT@
92 181
 OTHER_METHOD = @OTHER_METHOD@
93 182
 PACKAGE = @PACKAGE@
@@ -95,6 +184,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
95 184
 PACKAGE_NAME = @PACKAGE_NAME@
96 185
 PACKAGE_STRING = @PACKAGE_STRING@
97 186
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
187
+PACKAGE_URL = @PACKAGE_URL@
98 188
 PACKAGE_VERSION = @PACKAGE_VERSION@
99 189
 PATH_SEPARATOR = @PATH_SEPARATOR@
100 190
 PID_DIR = @PID_DIR@
@@ -103,24 +193,29 @@ SET_MAKE = @SET_MAKE@
103 193
 SHELL = @SHELL@
104 194
 STRIP = @STRIP@
105 195
 VERSION = @VERSION@
196
+abs_builddir = @abs_builddir@
197
+abs_srcdir = @abs_srcdir@
198
+abs_top_builddir = @abs_top_builddir@
199
+abs_top_srcdir = @abs_top_srcdir@
106 200
 ac_ct_CC = @ac_ct_CC@
107 201
 ac_ct_CXX = @ac_ct_CXX@
108
-ac_ct_STRIP = @ac_ct_STRIP@
109
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
110
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
111
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
112
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
113 202
 am__include = @am__include@
114 203
 am__leading_dot = @am__leading_dot@
115 204
 am__quote = @am__quote@
205
+am__tar = @am__tar@
206
+am__untar = @am__untar@
116 207
 bindir = @bindir@
117 208
 build = @build@
118 209
 build_alias = @build_alias@
119 210
 build_cpu = @build_cpu@
120 211
 build_os = @build_os@
121 212
 build_vendor = @build_vendor@
213
+builddir = @builddir@
122 214
 datadir = @datadir@
215
+datarootdir = @datarootdir@
123 216
 debug_flags = @debug_flags@
217
+docdir = @docdir@
218
+dvidir = @dvidir@
124 219
 exec_prefix = @exec_prefix@
125 220
 gmp = @gmp@
126 221
 host = @host@
@@ -128,21 +223,29 @@ host_alias = @host_alias@
128 223
 host_cpu = @host_cpu@
129 224
 host_os = @host_os@
130 225
 host_vendor = @host_vendor@
226
+htmldir = @htmldir@
131 227
 includedir = @includedir@
132 228
 infodir = @infodir@
133 229
 install_sh = @install_sh@
134 230
 libdir = @libdir@
135 231
 libexecdir = @libexecdir@
232
+localedir = @localedir@
136 233
 localstatedir = @localstatedir@
137 234
 mandir = @mandir@
138 235
 mkdir_p = @mkdir_p@
139 236
 oldincludedir = @oldincludedir@
237
+pdfdir = @pdfdir@
140 238
 prefix = @prefix@
141 239
 program_transform_name = @program_transform_name@
240
+psdir = @psdir@
142 241
 sbindir = @sbindir@
143 242
 sharedstatedir = @sharedstatedir@
243
+srcdir = @srcdir@
144 244
 sysconfdir = @sysconfdir@
145 245
 target_alias = @target_alias@
246
+top_build_prefix = @top_build_prefix@
247
+top_builddir = @top_builddir@
248
+top_srcdir = @top_srcdir@
146 249
 bin_SCRIPTS = ntk-wifi
147 250
 scriptconfdir = $(sysconfdir)
148 251
 scriptconf_SCRIPTS = ip_masquerade.sh tc_shaper.sh rc.ntk
@@ -153,14 +256,14 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
153 256
 	@for dep in $?; do \
154 257
 	  case '$(am__configure_deps)' in \
155 258
 	    *$$dep*) \
156
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
157
-		&& exit 0; \
259
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
260
+	        && { if test -f $@; then exit 0; else break; fi; }; \
158 261
 	      exit 1;; \
159 262
 	  esac; \
160 263
 	done; \
161
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/scripts/Makefile'; \
162
-	cd $(top_srcdir) && \
163
-	  $(AUTOMAKE) --gnu  src/scripts/Makefile
264
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/scripts/Makefile'; \
265
+	$(am__cd) $(top_srcdir) && \
266
+	  $(AUTOMAKE) --gnu src/scripts/Makefile
164 267
 .PRECIOUS: Makefile
165 268
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
166 269
 	@case '$?' in \
@@ -178,76 +281,111 @@ $(top_srcdir)/configure:  $(am__configure_deps)
178 281
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
179 282
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
180 283
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
284
+$(am__aclocal_m4_deps):
181 285
 install-binSCRIPTS: $(bin_SCRIPTS)
182 286
 	@$(NORMAL_INSTALL)
183
-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
184
-	@list='$(bin_SCRIPTS)'; for p in $$list; do \
287
+	@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
288
+	if test -n "$$list"; then \
289
+	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
290
+	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
291
+	fi; \
292
+	for p in $$list; do \
185 293
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
186
-	  if test -f $$d$$p; then \
187
-	    f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
188
-	    echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \
189
-	    $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \
190
-	  else :; fi; \
191
-	done
294
+	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
295
+	done | \
296
+	sed -e 'p;s,.*/,,;n' \
297
+	    -e 'h;s|.*|.|' \
298
+	    -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
299
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
300
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
301
+	    if ($$2 == $$4) { files[d] = files[d] " " $$1; \
302
+	      if (++n[d] == $(am__install_max)) { \
303
+		print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
304
+	    else { print "f", d "/" $$4, $$1 } } \
305
+	  END { for (d in files) print "f", d, files[d] }' | \
306
+	while read type dir files; do \
307
+	     if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
308
+	     test -z "$$files" || { \
309
+	       echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(bindir)$$dir'"; \
310
+	       $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
311
+	     } \
312
+	; done
192 313
 
193 314
 uninstall-binSCRIPTS:
194 315
 	@$(NORMAL_UNINSTALL)
195
-	@list='$(bin_SCRIPTS)'; for p in $$list; do \
196
-	  f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
197
-	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
198
-	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
199
-	done
316
+	@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \
317
+	files=`for p in $$list; do echo "$$p"; done | \
318
+	       sed -e 's,.*/,,;$(transform)'`; \
319
+	dir='$(DESTDIR)$(bindir)'; $(am__uninstall_files_from_dir)
200 320
 install-scriptconfSCRIPTS: $(scriptconf_SCRIPTS)
201 321
 	@$(NORMAL_INSTALL)
202
-	test -z "$(scriptconfdir)" || $(mkdir_p) "$(DESTDIR)$(scriptconfdir)"
203
-	@list='$(scriptconf_SCRIPTS)'; for p in $$list; do \
322
+	@list='$(scriptconf_SCRIPTS)'; test -n "$(scriptconfdir)" || list=; \
323
+	if test -n "$$list"; then \
324
+	  echo " $(MKDIR_P) '$(DESTDIR)$(scriptconfdir)'"; \
325
+	  $(MKDIR_P) "$(DESTDIR)$(scriptconfdir)" || exit 1; \
326
+	fi; \
327
+	for p in $$list; do \
204 328
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
205
-	  if test -f $$d$$p; then \
206
-	    f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
207
-	    echo " $(scriptconfSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(scriptconfdir)/$$f'"; \
208
-	    $(scriptconfSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(scriptconfdir)/$$f"; \
209
-	  else :; fi; \
210
-	done
329
+	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
330
+	done | \
331
+	sed -e 'p;s,.*/,,;n' \
332
+	    -e 'h;s|.*|.|' \
333
+	    -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
334
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
335
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
336
+	    if ($$2 == $$4) { files[d] = files[d] " " $$1; \
337
+	      if (++n[d] == $(am__install_max)) { \
338
+		print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
339
+	    else { print "f", d "/" $$4, $$1 } } \
340
+	  END { for (d in files) print "f", d, files[d] }' | \
341
+	while read type dir files; do \
342
+	     if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
343
+	     test -z "$$files" || { \
344
+	       echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(scriptconfdir)$$dir'"; \
345
+	       $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(scriptconfdir)$$dir" || exit $$?; \
346
+	     } \
347
+	; done
211 348
 
212 349
 uninstall-scriptconfSCRIPTS:
213 350
 	@$(NORMAL_UNINSTALL)
214
-	@list='$(scriptconf_SCRIPTS)'; for p in $$list; do \
215
-	  f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
216
-	  echo " rm -f '$(DESTDIR)$(scriptconfdir)/$$f'"; \
217
-	  rm -f "$(DESTDIR)$(scriptconfdir)/$$f"; \
218
-	done
219
-uninstall-info-am:
220
-tags: TAGS
221
-TAGS:
351
+	@list='$(scriptconf_SCRIPTS)'; test -n "$(scriptconfdir)" || exit 0; \
352
+	files=`for p in $$list; do echo "$$p"; done | \
353
+	       sed -e 's,.*/,,;$(transform)'`; \
354
+	dir='$(DESTDIR)$(scriptconfdir)'; $(am__uninstall_files_from_dir)
355
+tags TAGS:
356
+
357
+ctags CTAGS:
222 358
 
223
-ctags: CTAGS
224
-CTAGS:
359
+cscope cscopelist:
225 360
 
226 361
 
227 362
 distdir: $(DISTFILES)
228
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
229
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
230
-	list='$(DISTFILES)'; for file in $$list; do \
231
-	  case $$file in \
232
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
233
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
234
-	  esac; \
363
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
364
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
365
+	list='$(DISTFILES)'; \
366
+	  dist_files=`for file in $$list; do echo $$file; done | \
367
+	  sed -e "s|^$$srcdirstrip/||;t" \
368
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
369
+	case $$dist_files in \
370
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
371
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
372
+			   sort -u` ;; \
373
+	esac; \
374
+	for file in $$dist_files; do \
235 375
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
236
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
237
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
238
-	    dir="/$$dir"; \
239
-	    $(mkdir_p) "$(distdir)$$dir"; \
240
-	  else \
241
-	    dir=''; \
242
-	  fi; \
243 376
 	  if test -d $$d/$$file; then \
377
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
378
+	    if test -d "$(distdir)/$$file"; then \
379
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
380
+	    fi; \
244 381
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
245
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
382
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
383
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
246 384
 	    fi; \
247
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
385
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
248 386
 	  else \
249
-	    test -f $(distdir)/$$file \
250
-	    || cp -p $$d/$$file $(distdir)/$$file \
387
+	    test -f "$(distdir)/$$file" \
388
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
251 389
 	    || exit 1; \
252 390
 	  fi; \
253 391
 	done
@@ -256,7 +394,7 @@ check: check-am
256 394
 all-am: Makefile $(SCRIPTS)
257 395
 installdirs:
258 396
 	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(scriptconfdir)"; do \
259
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
397
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
260 398
 	done
261 399
 install: install-am
262 400
 install-exec: install-exec-am
@@ -268,16 +406,22 @@ install-am: all-am
268 406
 
269 407
 installcheck: installcheck-am
270 408
 install-strip:
271
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
272
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
273
-	  `test -z '$(STRIP)' || \
274
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
409
+	if test -z '$(STRIP)'; then \
410
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
411
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
412
+	      install; \
413
+	else \
414
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
415
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
416
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
417
+	fi
275 418
 mostlyclean-generic:
276 419
 
277 420
 clean-generic:
278 421
 
279 422
 distclean-generic:
280
-	-rm -f $(CONFIG_CLEAN_FILES)
423
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
424
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
281 425
 
282 426
 maintainer-clean-generic:
283 427
 	@echo "This command is intended for maintainers to use"
@@ -296,18 +440,38 @@ dvi-am:
296 440
 
297 441
 html: html-am
298 442
 
443
+html-am:
444
+
299 445
 info: info-am
300 446
 
301 447
 info-am:
302 448
 
303 449
 install-data-am: install-scriptconfSCRIPTS
304 450
 
451
+install-dvi: install-dvi-am
452
+
453
+install-dvi-am:
454
+
305 455
 install-exec-am: install-binSCRIPTS
306 456
 
457
+install-html: install-html-am
458
+
459
+install-html-am:
460
+
307 461
 install-info: install-info-am
308 462
 
463
+install-info-am:
464
+
309 465
 install-man:
310 466
 
467
+install-pdf: install-pdf-am
468
+
469
+install-pdf-am:
470
+
471
+install-ps: install-ps-am
472
+
473
+install-ps-am:
474
+
311 475
 installcheck-am:
312 476
 
313 477
 maintainer-clean: maintainer-clean-am
@@ -326,19 +490,23 @@ ps: ps-am
326 490
 
327 491
 ps-am:
328 492
 
329
-uninstall-am: uninstall-binSCRIPTS uninstall-info-am \
330
-	uninstall-scriptconfSCRIPTS
331
-
332
-.PHONY: all all-am check check-am clean clean-generic distclean \
333
-	distclean-generic distdir dvi dvi-am html html-am info info-am \
334
-	install install-am install-binSCRIPTS install-data \
335
-	install-data-am install-exec install-exec-am install-info \
336
-	install-info-am install-man install-scriptconfSCRIPTS \
337
-	install-strip installcheck installcheck-am installdirs \
338
-	maintainer-clean maintainer-clean-generic mostlyclean \
339
-	mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \
340
-	uninstall-binSCRIPTS uninstall-info-am \
341
-	uninstall-scriptconfSCRIPTS
493
+uninstall-am: uninstall-binSCRIPTS uninstall-scriptconfSCRIPTS
494
+
495
+.MAKE: install-am install-strip
496
+
497
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
498
+	ctags-am distclean distclean-generic distdir dvi dvi-am html \
499
+	html-am info info-am install install-am install-binSCRIPTS \
500
+	install-data install-data-am install-dvi install-dvi-am \
501
+	install-exec install-exec-am install-html install-html-am \
502
+	install-info install-info-am install-man install-pdf \
503
+	install-pdf-am install-ps install-ps-am \
504
+	install-scriptconfSCRIPTS install-strip installcheck \
505
+	installcheck-am installdirs maintainer-clean \
506
+	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
507
+	pdf-am ps ps-am tags-am uninstall uninstall-am \
508
+	uninstall-binSCRIPTS uninstall-scriptconfSCRIPTS
509
+
342 510
 
343 511
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
344 512
 # Otherwise a system limit (for SysV at least) may be exceeded.

Loading…
Cancel
Save