projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(compile_range): When casting to const unsigned char *, put const first.
[gnulib.git]
/
lib
/
backupfile.c
diff --git
a/lib/backupfile.c
b/lib/backupfile.c
index
c6d7914
..
2ef0f0b
100644
(file)
--- a/
lib/backupfile.c
+++ b/
lib/backupfile.c
@@
-15,40
+15,52
@@
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. */
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$srcdir will use ./config.h rather than $srcdir/config.h
+ (which it would do because it found this file in $srcdir). */
+#include <config.h>
+#else
+#include "config.h"
+#endif
+#endif
+
#include <stdio.h>
#include <ctype.h>
#include <sys/types.h>
#include "backupfile.h"
#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>
#include <string.h>
+#ifndef index
#define index strchr
#define index strchr
+#endif
+#ifndef rindex
#define rindex strrchr
#define rindex strrchr
+#endif
#else
#include <strings.h>
#endif
#ifdef DIRENT
#include <dirent.h>
#else
#include <strings.h>
#endif
#ifdef DIRENT
#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 */
+#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 */
#ifdef VOID_CLOSEDIR
/* Fake a return value. */
#ifdef VOID_CLOSEDIR
/* Fake a return value. */
@@
-63,12
+75,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,15
+152,15
@@
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;
-
+
dirp = opendir (dir);
if (!dirp)
return 0;
dirp = opendir (dir);
if (!dirp)
return 0;
-
+
highest_version = 0;
file_name_length = strlen (file);
highest_version = 0;
file_name_length = strlen (file);
@@
-154,7
+168,7
@@
max_backup_version (file, dir)
{
if (!REAL_DIR_ENTRY (dp) || NLENGTH (dp) <= file_name_length)
continue;
{
if (!REAL_DIR_ENTRY (dp) || NLENGTH (dp) <= file_name_length)
continue;
-
+
this_version = version_number (file, dp->d_name, file_name_length);
if (this_version > highest_version)
highest_version = this_version;
this_version = version_number (file, dp->d_name, file_name_length);
if (this_version > highest_version)
highest_version = this_version;
@@
-193,7
+207,7
@@
version_number (base, backup, base_length)
{
int version;
char *p;
{
int version;
char *p;
-
+
version = 0;
if (!strncmp (base, backup, base_length) && ISDIGIT (backup[base_length]))
{
version = 0;
if (!strncmp (base, backup, base_length) && ISDIGIT (backup[base_length]))
{
@@
-213,7
+227,7
@@
concat (str1, str2)
char *str1, *str2;
{
char *newstr;
char *str1, *str2;
{
char *newstr;
-
char
str1_length = strlen (str1);
+
int
str1_length = strlen (str1);
newstr = malloc (str1_length + strlen (str2) + 1);
if (newstr == 0)
newstr = malloc (str1_length + strlen (str2) + 1);
if (newstr == 0)