projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(parse_user_spec): Use strchr, not index.
[gnulib.git]
/
lib
/
backupfile.c
diff --git
a/lib/backupfile.c
b/lib/backupfile.c
index
cb94429
..
89b5f1e
100644
(file)
--- a/
lib/backupfile.c
+++ b/
lib/backupfile.c
@@
-19,50
+19,37
@@
Some algorithms adapted from GNU Emacs. */
#ifdef HAVE_CONFIG_H
Some algorithms adapted from GNU Emacs. */
#ifdef HAVE_CONFIG_H
-#if defined (CONFIG_BROKETS)
-/* We use <config.h> instead of "config.h" so that a compilation
- using -I. -I will use ./config.h rather than /config.h
- (which it would do because it found this file in ). */
#include <config.h>
#include <config.h>
-#else
-#include "config.h"
-#endif
#endif
#include <stdio.h>
#include <ctype.h>
#include <sys/types.h>
#include "backupfile.h"
#endif
#include <stdio.h>
#include <ctype.h>
#include <sys/types.h>
#include "backupfile.h"
-#if
defined(STDC_HEADERS) || defined(HAVE_STRING_H)
+#if
def HAVE_STRING_H
#include <string.h>
#include <string.h>
-#ifndef index
-#define index strchr
-#endif
-#ifndef rindex
-#define rindex strrchr
-#endif
#else
#include <strings.h>
#endif
#else
#include <strings.h>
#endif
-#if
defined(DIRENT) || defined(_POSIX_VERSION)
+#if
def HAVE_DIRENT_H
#include <dirent.h>
#define NLENGTH(direct) (strlen((direct)->d_name))
#include <dirent.h>
#define NLENGTH(direct) (strlen((direct)->d_name))
-#else /* not
(DIRENT or _POSIX_VERSION)
*/
+#else /* not
HAVE_DIRENT_H
*/
#define dirent direct
#define NLENGTH(direct) ((direct)->d_namlen)
#define dirent direct
#define NLENGTH(direct) ((direct)->d_namlen)
-#ifdef
SYSNDIR
+#ifdef
HAVE_SYS_NDIR_H
#include <sys/ndir.h>
#include <sys/ndir.h>
-#endif /*
SYSNDIR
*/
-#ifdef
SYSDIR
+#endif /*
HAVE_SYS_NDIR_H
*/
+#ifdef
HAVE_SYS_DIR_H
#include <sys/dir.h>
#include <sys/dir.h>
-#endif /*
SYSDIR
*/
-#ifdef
NDIR
+#endif /*
HAVE_SYS_DIR_H
*/
+#ifdef
HAVE_NDIR_H
#include <ndir.h>
#include <ndir.h>
-#endif /*
NDIR
*/
-#endif /*
DIRENT or _POSIX_VERSION
*/
+#endif /*
HAVE_NDIR_H
*/
+#endif /*
HAVE_DIRENT_H
*/
-#ifdef
VOID_CLOSEDIR
+#ifdef
CLOSEDIR_VOID
/* Fake a return value. */
#define CLOSEDIR(d) (closedir (d), 0)
#else
/* Fake a return value. */
#define CLOSEDIR(d) (closedir (d), 0)
#else
@@
-75,12
+62,13
@@
char *malloc ();
#endif
char *malloc ();
#endif
-#if !defined (isascii) || defined (STDC_HEADERS)
-#undef isascii
-#define isascii(c) 1
+#if defined (STDC_HEADERS) || (!defined (isascii) && !defined (HAVE_ISASCII))
+#define ISASCII(c) 1
+#else
+#define ISASCII(c) isascii(c)
#endif
#endif
-#define ISDIGIT(c) (
isascii ((unsigned char ) c
) \
+#define ISDIGIT(c) (
ISASCII ((unsigned char) (c)
) \
&& isdigit ((unsigned char) (c)))
#if defined (HAVE_UNISTD_H)
&& isdigit ((unsigned char) (c)))
#if defined (HAVE_UNISTD_H)