summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>2003-05-30 07:39:20 +0000
committerJim Meyering <jim@meyering.net>2003-05-30 07:39:20 +0000
commitdb417f264e7bc0f1a834c65b4cc27b562d711e65 (patch)
tree01f391d96146869c88eab1c202303e957bc461f5
parentba2b74806ee484f063465ca58875bbe5f93e08c3 (diff)
downloadcoreutils-db417f264e7bc0f1a834c65b4cc27b562d711e65.tar.xz
Update from gnulib.
-rw-r--r--lib/addext.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/lib/addext.c b/lib/addext.c
index f1eb0e05a..283756bf4 100644
--- a/lib/addext.c
+++ b/lib/addext.c
@@ -1,5 +1,7 @@
/* addext.c -- add an extension to a file name
- Copyright 1990, 1997, 1998, 1999, 2001, 2002 Free Software Foundation, Inc.
+
+ Copyright (C) 1990, 1997, 1998, 1999, 2001, 2003 Free Software
+ Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -29,9 +31,7 @@
# define HAVE_LONG_FILE_NAMES 0
#endif
-#if HAVE_LIMITS_H
-# include <limits.h>
-#endif
+#include <limits.h>
#ifndef _POSIX_NAME_MAX
# define _POSIX_NAME_MAX 14
#endif
@@ -83,7 +83,11 @@ addext (char *filename, char const *ext, int e)
*s = c;
}
if (0 <= name_max || errno == 0)
- slen_max = name_max == (long) (size_t) name_max ? name_max : -1;
+ {
+ long size = slen_max = name_max;
+ if (name_max != size)
+ slen_max = -1;
+ }
}
#endif