projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* [sgi]: Undefine timezone before including <time.h>.
[gnulib.git]
/
lib
/
backupfile.c
diff --git
a/lib/backupfile.c
b/lib/backupfile.c
index
c6d7914
..
7a624cf
100644
(file)
--- a/
lib/backupfile.c
+++ b/
lib/backupfile.c
@@
-15,14
+15,14
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
-/* David MacKenzie <djm@ai.mit.edu>.
+/* David MacKenzie <djm@
gnu.
ai.mit.edu>.
Some algorithms adapted from GNU Emacs. */
#include <stdio.h>
#include <ctype.h>
#include <sys/types.h>
#include "backupfile.h"
Some algorithms adapted from GNU Emacs. */
#include <stdio.h>
#include <ctype.h>
#include <sys/types.h>
#include "backupfile.h"
-#if defined(
USG) || defined(STDC_HEADERS
)
+#if defined(
STDC_HEADERS) || defined(HAVE_STRING_H
)
#include <string.h>
#define index strchr
#define rindex strrchr
#include <string.h>
#define index strchr
#define rindex strrchr
@@
-30,25
+30,22
@@
#include <strings.h>
#endif
#include <strings.h>
#endif
-#if
def DIRENT
+#if
defined(DIRENT) || defined(_POSIX_VERSION)
#include <dirent.h>
#include <dirent.h>
-#ifdef direct
-#undef direct
-#endif
-#define direct dirent
#define NLENGTH(direct) (strlen((direct)->d_name))
#define NLENGTH(direct) (strlen((direct)->d_name))
-#else /* !DIRENT */
+#else /* not (DIRENT or _POSIX_VERSION) */
+#define dirent direct
#define NLENGTH(direct) ((direct)->d_namlen)
#define NLENGTH(direct) ((direct)->d_namlen)
-#ifdef USG
#ifdef SYSNDIR
#include <sys/ndir.h>
#ifdef SYSNDIR
#include <sys/ndir.h>
-#else /* !SYSNDIR */
-#include <ndir.h>
-#endif /* !SYSNDIR */
-#else /* !USG */
+#endif /* SYSNDIR */
+#ifdef SYSDIR
#include <sys/dir.h>
#include <sys/dir.h>
-#endif /* !USG */
-#endif /* !DIRENT */
+#endif /* SYSDIR */
+#ifdef NDIR
+#include <ndir.h>
+#endif /* NDIR */
+#endif /* DIRENT or _POSIX_VERSION */
#ifdef VOID_CLOSEDIR
/* Fake a return value. */
#ifdef VOID_CLOSEDIR
/* Fake a return value. */
@@
-63,12
+60,14
@@
char *malloc ();
#endif
char *malloc ();
#endif
-#ifndef isascii
-#define ISDIGIT(c) (isdigit ((unsigned char) (c)))
-#else
-#define ISDIGIT(c) (isascii (c) && isdigit (c))
+#if !defined (isascii) || defined (STDC_HEADERS)
+#undef isascii
+#define isascii(c) 1
#endif
#endif
+#define ISDIGIT(c) (isascii ((unsigned char ) c) \
+ && isdigit ((unsigned char) (c)))
+
#if defined (HAVE_UNISTD_H)
#include <unistd.h>
#endif
#if defined (HAVE_UNISTD_H)
#include <unistd.h>
#endif
@@
-138,7
+137,7
@@
max_backup_version (file, dir)
char *file, *dir;
{
DIR *dirp;
char *file, *dir;
{
DIR *dirp;
- struct dire
c
t *dp;
+ struct dire
n
t *dp;
int highest_version;
int this_version;
int file_name_length;
int highest_version;
int this_version;
int file_name_length;