From: Paul Eggert Date: Thu, 29 Mar 2007 21:57:53 +0000 (+0000) Subject: * m4/getcwd-path-max.m4 (gl_FUNC_GETCWD_PATH_MAX): Don't bother to X-Git-Tag: cvs-readonly~638 X-Git-Url: http://erislabs.net/gitweb/?a=commitdiff_plain;ds=inline;h=8d38e787ae4ddaa20c12004c06d2eaa5a967142b;p=gnulib.git * m4/getcwd-path-max.m4 (gl_FUNC_GETCWD_PATH_MAX): Don't bother to try to remove a parent directory if the child couldn't be removed (except for the first rmdir, which could fail because the child doesn't exist). Problem reported by Jeff Blaine in . --- diff --git a/ChangeLog b/ChangeLog index df5abe753..55c644050 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2007-03-29 Paul Eggert + + * m4/getcwd-path-max.m4 (gl_FUNC_GETCWD_PATH_MAX): Don't bother to + try to remove a parent directory if the child couldn't be removed + (except for the first rmdir, which could fail because the child + doesn't exist). Problem reported by Jeff Blaine in + . + 2007-03-28 Bruno Haible * lib/striconveh.c (utf8conv_carefully): New function. diff --git a/m4/getcwd-path-max.m4 b/m4/getcwd-path-max.m4 index 3d0af8751..5e6d58bda 100644 --- a/m4/getcwd-path-max.m4 +++ b/m4/getcwd-path-max.m4 @@ -1,4 +1,4 @@ -#serial 12 +#serial 13 # Check for several getcwd bugs with long file names. # If so, arrange to compile the wrapper function. @@ -6,7 +6,7 @@ # I've heard that this is due to a Linux kernel bug, and that it has # been fixed between 2.4.21-pre3 and 2.4.21-pre4. */ -# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -163,7 +163,8 @@ main () { if (chdir ("..") < 0) break; - rmdir (DIR_NAME); + if (rmdir (DIR_NAME) != 0) + break; } }