Browse code

cオプションを使った時に終了できなくなる不具合を修正

Yasui authored on 2012/05/11 19:09:55
Showing 5 changed files
... ...
@@ -1,3 +1,6 @@
1
+1.3.2:
2
+ - fix: infinite loop during shutdown when use c option.
3
+
1 4
 1.3.1:
2 5
  - add -T option (traffic-shape, Mbps order)
3 6
 
... ...
@@ -1,3 +1,6 @@
1
+1.3.2:
2
+ - cオプション使用時に終了できなくなる場合がある不具合を修正
3
+
1 4
 1.3.1:
2 5
  - Tオプションを追加
3 6
    Mbps単位で最大転送レートを指定できるようにした
... ...
@@ -1,6 +1,6 @@
1 1
 #! /bin/sh
2 2
 # Guess values for system-dependent variables and create Makefiles.
3
-# Generated by GNU Autoconf 2.61 for makuosan 1.3.1.
3
+# Generated by GNU Autoconf 2.61 for makuosan 1.3.2.
4 4
 #
5 5
 # Report bugs to <info-makuosan@klab.jp>.
6 6
 #
... ...
@@ -574,8 +574,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
574 574
 # Identity of this package.
575 575
 PACKAGE_NAME='makuosan'
576 576
 PACKAGE_TARNAME='makuosan'
577
-PACKAGE_VERSION='1.3.1'
578
-PACKAGE_STRING='makuosan 1.3.1'
577
+PACKAGE_VERSION='1.3.2'
578
+PACKAGE_STRING='makuosan 1.3.2'
579 579
 PACKAGE_BUGREPORT='info-makuosan@klab.jp'
580 580
 
581 581
 ac_unique_file="makuosan.c"
... ...
@@ -1209,7 +1209,7 @@ if test "$ac_init_help" = "long"; then
1209 1209
   # Omit some internal or obsolete options to make the list less imposing.
1210 1210
   # This message is too long to be a string in the A/UX 3.1 sh.
1211 1211
   cat <<_ACEOF
1212
-\`configure' configures makuosan 1.3.1 to adapt to many kinds of systems.
1212
+\`configure' configures makuosan 1.3.2 to adapt to many kinds of systems.
1213 1213
 
1214 1214
 Usage: $0 [OPTION]... [VAR=VALUE]...
1215 1215
 
... ...
@@ -1275,7 +1275,7 @@ fi
1275 1275
 
1276 1276
 if test -n "$ac_init_help"; then
1277 1277
   case $ac_init_help in
1278
-     short | recursive ) echo "Configuration of makuosan 1.3.1:";;
1278
+     short | recursive ) echo "Configuration of makuosan 1.3.2:";;
1279 1279
    esac
1280 1280
   cat <<\_ACEOF
1281 1281
 
... ...
@@ -1360,7 +1360,7 @@ fi
1360 1360
 test -n "$ac_init_help" && exit $ac_status
1361 1361
 if $ac_init_version; then
1362 1362
   cat <<\_ACEOF
1363
-makuosan configure 1.3.1
1363
+makuosan configure 1.3.2
1364 1364
 generated by GNU Autoconf 2.61
1365 1365
 
1366 1366
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
... ...
@@ -1374,7 +1374,7 @@ cat >config.log <<_ACEOF
1374 1374
 This file contains any messages produced by compilers while
1375 1375
 running configure, to aid debugging if configure makes a mistake.
1376 1376
 
1377
-It was created by makuosan $as_me 1.3.1, which was
1377
+It was created by makuosan $as_me 1.3.2, which was
1378 1378
 generated by GNU Autoconf 2.61.  Invocation command line was
1379 1379
 
1380 1380
   $ $0 $@
... ...
@@ -2065,7 +2065,7 @@ fi
2065 2065
 
2066 2066
 # Define the identity of the package.
2067 2067
  PACKAGE='makuosan'
2068
- VERSION='1.3.1'
2068
+ VERSION='1.3.2'
2069 2069
 
2070 2070
 
2071 2071
 cat >>confdefs.h <<_ACEOF
... ...
@@ -9206,7 +9206,7 @@ exec 6>&1
9206 9206
 # report actual input values of CONFIG_FILES etc. instead of their
9207 9207
 # values after options handling.
9208 9208
 ac_log="
9209
-This file was extended by makuosan $as_me 1.3.1, which was
9209
+This file was extended by makuosan $as_me 1.3.2, which was
9210 9210
 generated by GNU Autoconf 2.61.  Invocation command line was
9211 9211
 
9212 9212
   CONFIG_FILES    = $CONFIG_FILES
... ...
@@ -9263,7 +9263,7 @@ Report bugs to <bug-autoconf@gnu.org>."
9263 9263
 _ACEOF
9264 9264
 cat >>$CONFIG_STATUS <<_ACEOF
9265 9265
 ac_cs_version="\\
9266
-makuosan config.status 1.3.1
9266
+makuosan config.status 1.3.2
9267 9267
 configured by $0, generated by GNU Autoconf 2.61,
9268 9268
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
9269 9269
 
... ...
@@ -1,7 +1,7 @@
1 1
 #                                               -*- Autoconf -*-
2 2
 # Process this file with autoconf to produce a configure script.
3 3
 AC_PREREQ(2.61)
4
-AC_INIT(makuosan, 1.3.1, info-makuosan@klab.jp)
4
+AC_INIT(makuosan, 1.3.2, info-makuosan@klab.jp)
5 5
 AM_INIT_AUTOMAKE
6 6
 AC_CONFIG_SRCDIR([makuosan.c])
7 7
 AC_CONFIG_HEADER([config.h])
... ...
@@ -6,6 +6,7 @@
6 6
 
7 7
 static void chexit()
8 8
 {
9
+  int retrycnt = 256;
9 10
   char cwd[PATH_MAX];
10 11
   if(moption.chroot){
11 12
     if(strcmp("Linux", moption.uts.sysname)){
... ...
@@ -18,9 +19,10 @@ static void chexit()
18 18
     rmdir(cwd);
19 19
     chdir("..");
20 20
     getcwd(cwd,PATH_MAX);
21
-    while(strcmp("/", cwd)){
21
+    while(retrycnt && strcmp("/", cwd) && strcmp("(unreachable)/", cwd)){
22 22
       chdir("..");
23 23
       getcwd(cwd,PATH_MAX);
24
+      retrycnt--;
24 25
     }
25 26
     chroot(".");
26 27
   }