From 395587af75d7208aa30ec51e77446701e547c202 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Thu, 5 Aug 1993 02:16:29 +0000 Subject: [PATCH] GNU file utilities --- lib/Makefile.in | 22 +++++++++++++++------- lib/backupfile.c | 2 +- lib/filemode.c | 10 +++++++++- lib/stpcpy.c | 10 ++++------ 4 files changed, 29 insertions(+), 15 deletions(-) diff --git a/lib/Makefile.in b/lib/Makefile.in index 3377776edc..834f23fde2 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -1,6 +1,5 @@ # Makefile for library files used by GNU fileutils. -# Do not use this makefile directly, but only from `../Makefile'. -# Copyright (C) 1990, 1991, 1992 Free Software Foundation, Inc. +# Copyright (C) 1990, 1991, 1992, 1993 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 @@ -21,21 +20,28 @@ SHELL = /bin/sh srcdir = @srcdir@ VPATH = @srcdir@ -SOURCES = argmatch.c backupfile.c basename.c dirname.c eaccess.c \ +CC = @CC@ +AR = ar +RANLIB = @RANLIB@ +DEFS = @DEFS@ +CFLAGS = -g + +SOURCES = getdate.y posixtm.y \ +argmatch.c backupfile.c basename.c dirname.c eaccess.c \ error.c filemode.c fsusage.c getopt.c getopt1.c \ getversion.c idcache.c isdir.c makepath.c \ modechange.c mountlist.c savedir.c \ stripslash.c xgetcwd.c xmalloc.c xstrdup.c userspec.c yesno.c \ -getdate.y posixtm.y \ fileblocks.c fnmatch.c ftruncate.c mkdir.c mktime.c rename.c stpcpy.c \ strdup.c strstr.c alloca.c -OBJECTS = argmatch.o backupfile.o basename.o dirname.o eaccess.o \ +OBJECTS = getdate.o posixtm.o \ +argmatch.o backupfile.o basename.o dirname.o eaccess.o \ error.o filemode.o getopt.o getopt1.o \ getversion.o idcache.o isdir.o makepath.o \ modechange.o savedir.o \ stripslash.o xgetcwd.o xmalloc.o xstrdup.o userspec.o yesno.o \ -getdate.o posixtm.o @LIBOBJS@ @ALLOCA@ +@LIBOBJS@ @ALLOCA@ DISTFILES = Makefile.in backupfile.h getopt.h modechange.h \ fnmatch.h fsusage.h mountlist.h pathmax.h system.h $(SOURCES) @@ -43,7 +49,7 @@ fnmatch.h fsusage.h mountlist.h pathmax.h system.h $(SOURCES) all: libfu.a .c.o: - $(CC) -c $(DEFS) -I$(srcdir) $(CPPFLAGS) $(CFLAGS) $< + $(CC) -c $(CPPFLAGS) $(DEFS) -I$(srcdir) $(CFLAGS) $< install: all @@ -52,6 +58,8 @@ uninstall: TAGS: $(SOURCES) etags $(SOURCES) +check: + clean: rm -f *.a *.o diff --git a/lib/backupfile.c b/lib/backupfile.c index f15e530bff..670db0f5d5 100644 --- a/lib/backupfile.c +++ b/lib/backupfile.c @@ -216,7 +216,7 @@ concat (str1, str2) 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) diff --git a/lib/filemode.c b/lib/filemode.c index 451c7ac652..9293af6815 100644 --- a/lib/filemode.c +++ b/lib/filemode.c @@ -15,16 +15,24 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include #include + #ifndef S_IREAD #define S_IREAD S_IRUSR #define S_IWRITE S_IWUSR #define S_IEXEC S_IXUSR #endif -#ifndef S_ISREG /* Doesn't have POSIX.1 stat stuff. */ + +#if !defined(S_ISREG) || defined(NO_MODE_T) +/* Doesn't have POSIX.1 stat stuff or doesn't have mode_t. */ #define mode_t unsigned short #endif + #if !defined(S_ISBLK) && defined(S_IFBLK) #define S_ISBLK(m) (((m) & S_IFMT) == S_IFBLK) #endif diff --git a/lib/stpcpy.c b/lib/stpcpy.c index 4a70746bad..19695ad556 100644 --- a/lib/stpcpy.c +++ b/lib/stpcpy.c @@ -15,16 +15,14 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* Copy SOURCE into DEST, stopping after copying the first '\0', and - return a pointer to the '\0' at the end of DEST; - in other words, return DEST + strlen (SOURCE). */ +/* Copy SRC to DEST, returning the address of the terminating '\0' in DEST. */ char * -stpcpy (dest, source) +stpcpy (dest, src) char *dest; - char *source; + char *src; { - while ((*dest++ = *source++) != '\0') + while ((*dest++ = *src++) != '\0') /* Do nothing. */ ; return dest - 1; } -- 2.39.5