diff options
author | peter <peter@FreeBSD.org> | 1995-12-03 14:17:06 +0000 |
---|---|---|
committer | peter <peter@FreeBSD.org> | 1995-12-03 14:17:06 +0000 |
commit | 9ca0b4c9b412d7dda977978385bde9c882ff3f80 (patch) | |
tree | 117f9ffd4a531ea36c0d4a1d741bc1e14cb9aa98 /gnu/usr.bin/cvs/lib | |
parent | 35ee95831939f06cb374e771e2a51cf938bff1fa (diff) | |
download | FreeBSD-src-9ca0b4c9b412d7dda977978385bde9c882ff3f80.zip FreeBSD-src-9ca0b4c9b412d7dda977978385bde9c882ff3f80.tar.gz |
Restore white spaces to original cvs-1.4Alpha2 state so that we can
deal with the cvs-1.6 (and beyond) imports more cleanly and safely.
Diffstat (limited to 'gnu/usr.bin/cvs/lib')
-rw-r--r-- | gnu/usr.bin/cvs/lib/alloca.c | 2 | ||||
-rw-r--r-- | gnu/usr.bin/cvs/lib/argmatch.c | 4 | ||||
-rw-r--r-- | gnu/usr.bin/cvs/lib/fnmatch.c | 42 | ||||
-rw-r--r-- | gnu/usr.bin/cvs/lib/hash.c | 8 | ||||
-rw-r--r-- | gnu/usr.bin/cvs/lib/hash.h | 2 | ||||
-rw-r--r-- | gnu/usr.bin/cvs/lib/myndbm.c | 8 | ||||
-rw-r--r-- | gnu/usr.bin/cvs/lib/strerror.c | 2 | ||||
-rw-r--r-- | gnu/usr.bin/cvs/lib/subr.c | 34 | ||||
-rw-r--r-- | gnu/usr.bin/cvs/lib/system.h | 8 | ||||
-rw-r--r-- | gnu/usr.bin/cvs/lib/version.c | 4 |
10 files changed, 57 insertions, 57 deletions
diff --git a/gnu/usr.bin/cvs/lib/alloca.c b/gnu/usr.bin/cvs/lib/alloca.c index 948c526..b57659e 100644 --- a/gnu/usr.bin/cvs/lib/alloca.c +++ b/gnu/usr.bin/cvs/lib/alloca.c @@ -7,7 +7,7 @@ This implementation of the PWB library alloca() function, which is used to allocate space off the run-time stack so - that it is automatically reclaimed upon procedure exit, + that it is automatically reclaimed upon procedure exit, was inspired by discussions with J. Q. Johnson of Cornell. It should work under any C implementation that uses an diff --git a/gnu/usr.bin/cvs/lib/argmatch.c b/gnu/usr.bin/cvs/lib/argmatch.c index 5f31cea..327a27d 100644 --- a/gnu/usr.bin/cvs/lib/argmatch.c +++ b/gnu/usr.bin/cvs/lib/argmatch.c @@ -42,9 +42,9 @@ argmatch (arg, optlist) int arglen; /* Length of ARG. */ int matchind = -1; /* Index of first nonexact match. */ int ambiguous = 0; /* If nonzero, multiple nonexact match(es). */ - + arglen = strlen (arg); - + /* Test all elements for either exact match or abbreviated matches. */ for (i = 0; optlist[i]; i++) { diff --git a/gnu/usr.bin/cvs/lib/fnmatch.c b/gnu/usr.bin/cvs/lib/fnmatch.c index 34a0f89..2a05430 100644 --- a/gnu/usr.bin/cvs/lib/fnmatch.c +++ b/gnu/usr.bin/cvs/lib/fnmatch.c @@ -66,27 +66,27 @@ fnmatch (pattern, string, flags) (n == string || ((flags & FNM_PATHNAME) && n[-1] == '/'))) return FNM_NOMATCH; break; - + case '\\': if (!(flags & FNM_NOESCAPE)) c = *p++; if (*n != c) return FNM_NOMATCH; break; - + case '*': if ((flags & FNM_PERIOD) && *n == '.' && (n == string || ((flags & FNM_PATHNAME) && n[-1] == '/'))) return FNM_NOMATCH; - + for (c = *p++; c == '?' || c == '*'; c = *p++, ++n) if (((flags & FNM_PATHNAME) && *n == '/') || (c == '?' && *n == '\0')) return FNM_NOMATCH; - + if (c == '\0') return 0; - + { char c1 = (!(flags & FNM_NOESCAPE) && c == '\\') ? *p : c; for (--p; *n != '\0'; ++n) @@ -95,41 +95,41 @@ fnmatch (pattern, string, flags) return 0; return FNM_NOMATCH; } - + case '[': { /* Nonzero if the sense of the character class is inverted. */ register int not; - + if (*n == '\0') return FNM_NOMATCH; - + if ((flags & FNM_PERIOD) && *n == '.' && (n == string || ((flags & FNM_PATHNAME) && n[-1] == '/'))) return FNM_NOMATCH; - + not = (*p == '!' || *p == '^'); if (not) ++p; - + c = *p++; for (;;) { register char cstart = c, cend = c; - + if (!(flags & FNM_NOESCAPE) && c == '\\') cstart = cend = *p++; - + if (c == '\0') /* [ (unterminated) loses. */ return FNM_NOMATCH; - + c = *p++; - + if ((flags & FNM_PATHNAME) && c == '/') /* [/] can never match. */ return FNM_NOMATCH; - + if (c == '-' && *p != ']') { cend = *p++; @@ -139,17 +139,17 @@ fnmatch (pattern, string, flags) return FNM_NOMATCH; c = *p++; } - + if (*n >= cstart && *n <= cend) goto matched; - + if (c == ']') break; } if (!not) return FNM_NOMATCH; break; - + matched:; /* Skip the rest of the [...] that already matched. */ while (c != ']') @@ -157,7 +157,7 @@ fnmatch (pattern, string, flags) if (c == '\0') /* [... (unterminated) loses. */ return FNM_NOMATCH; - + c = *p++; if (!(flags & FNM_NOESCAPE) && c == '\\') /* 1003.2d11 is unclear if this is right. %%% */ @@ -167,12 +167,12 @@ fnmatch (pattern, string, flags) return FNM_NOMATCH; } break; - + default: if (c != *n) return FNM_NOMATCH; } - + ++n; } diff --git a/gnu/usr.bin/cvs/lib/hash.c b/gnu/usr.bin/cvs/lib/hash.c index 2e7444c..afc554d 100644 --- a/gnu/usr.bin/cvs/lib/hash.c +++ b/gnu/usr.bin/cvs/lib/hash.c @@ -1,9 +1,9 @@ /* * Copyright (c) 1992, Brian Berliner and Jeff Polk - * + * * You may distribute under the terms of the GNU General Public License as * specified in the README file that comes with the CVS 1.4 kit. - * + * * Polk's hash list manager. So cool. */ @@ -203,7 +203,7 @@ freenode (p) /* * insert item p at end of list "list" (maybe hash it too) if hashing and it * already exists, return -1 and don't actually put it in the list - * + * * return 0 on success */ int @@ -392,7 +392,7 @@ printlist (list) (void) printf("List at 0x%p: list = 0x%p, HASHSIZE = %d, next = 0x%p\n", list, list->list, HASHSIZE, list->next); - + (void) walklist(list, printnode, NULL); return; diff --git a/gnu/usr.bin/cvs/lib/hash.h b/gnu/usr.bin/cvs/lib/hash.h index f5dc375..8e10e81 100644 --- a/gnu/usr.bin/cvs/lib/hash.h +++ b/gnu/usr.bin/cvs/lib/hash.h @@ -2,7 +2,7 @@ /* * Copyright (c) 1992, Brian Berliner and Jeff Polk - * + * * You may distribute under the terms of the GNU General Public License as * specified in the README file that comes with the CVS 1.4 kit. */ diff --git a/gnu/usr.bin/cvs/lib/myndbm.c b/gnu/usr.bin/cvs/lib/myndbm.c index a8c9527..33ef49c 100644 --- a/gnu/usr.bin/cvs/lib/myndbm.c +++ b/gnu/usr.bin/cvs/lib/myndbm.c @@ -1,13 +1,13 @@ /* * Copyright (c) 1992, Brian Berliner - * + * * You may distribute under the terms of the GNU General Public License as * specified in the README file that comes with the CVS 1.4 kit. - * + * * A simple ndbm-emulator for CVS. It parses a text file of the format: - * + * * key value - * + * * at dbm_open time, and loads the entire file into memory. As such, it is * probably only good for fairly small modules files. Ours is about 30K in * size, and this code works fine. diff --git a/gnu/usr.bin/cvs/lib/strerror.c b/gnu/usr.bin/cvs/lib/strerror.c index d4a3679..b0bec13 100644 --- a/gnu/usr.bin/cvs/lib/strerror.c +++ b/gnu/usr.bin/cvs/lib/strerror.c @@ -661,7 +661,7 @@ strerror (errnoval) /* In range, and a valid message. Just return the message. */ msg = sys_errlist[errnoval]; } - + return (msg); } diff --git a/gnu/usr.bin/cvs/lib/subr.c b/gnu/usr.bin/cvs/lib/subr.c index 3dc39bd..d3d40b1 100644 --- a/gnu/usr.bin/cvs/lib/subr.c +++ b/gnu/usr.bin/cvs/lib/subr.c @@ -1,10 +1,10 @@ /* * Copyright (c) 1992, Brian Berliner and Jeff Polk * Copyright (c) 1989-1992, Brian Berliner - * + * * You may distribute under the terms of the GNU General Public License as * specified in the README file that comes with the CVS 1.4 kit. - * + * * Various useful functions for the CVS support code. */ @@ -394,7 +394,7 @@ unlink_file (f) /* * Compare "file1" to "file2". Return non-zero if they don't compare exactly. - * + * * mallocs a buffer large enough to hold the entire file and does two reads to * load the buffer and calls memcmp to do the cmp. This is reasonable, since * source files are typically not too large. @@ -535,10 +535,10 @@ getcaller () * arguments. The options to run_setup are essentially like printf(). The * arguments will be parsed into whitespace separated words and added to the * global run_argv list. - * + * * Then, optionally call run_arg() for each additional argument that you'd like * to pass to the executed program. - * + * * Finally, call run_exec() to execute the program with the specified arguments. * The execvp() syscall will be used, so that the PATH is searched correctly. * File redirections can be performed in the call to run_exec(). @@ -550,10 +550,10 @@ static int run_argc_allocated; /* VARARGS */ #if defined (HAVE_VPRINTF) && (defined (USE_PROTOTYPES) ? USE_PROTOTYPES : defined (__STDC__)) -void +void run_setup (char *fmt,...) #else -void +void run_setup (fmt, va_alist) char *fmt; va_dcl @@ -603,10 +603,10 @@ run_arg (s) /* VARARGS */ #if defined (HAVE_VPRINTF) && (defined (USE_PROTOTYPES) ? USE_PROTOTYPES : defined (__STDC__)) -void +void run_args (char *fmt,...) #else -void +void run_args (fmt, va_alist) char *fmt; va_dcl @@ -950,7 +950,7 @@ gca (rev1, rev2) int i; char c[2]; char *s[2]; - + for (i = 0; i < 2; ++i) { /* swap out the dot */ @@ -958,10 +958,10 @@ gca (rev1, rev2) if (s[i] != NULL) { c[i] = *s[i]; } - + /* read an int */ j[i] = atoi (p[i]); - + /* swap back the dot... */ if (s[i] != NULL) { *s[i] = c[i]; @@ -972,9 +972,9 @@ gca (rev1, rev2) /* or mark us at the end */ p[i] = NULL; } - + } - + /* use the lowest. */ (void) sprintf (gca + strlen (gca), "%d.", j[0] < j[1] ? j[0] : j[1]); @@ -1009,11 +1009,11 @@ gca (rev1, rev2) { /* we have a minor number. use it. */ q = gca + strlen (gca); - + *q++ = '.'; for ( ; *s != '.' && *s != '\0'; ) *q++ = *s++; - + *q = '\0'; } } @@ -1021,7 +1021,7 @@ gca (rev1, rev2) { /* if we have an even number of dots, then we have a branch. remove the last number in order to make it a revision. */ - + char *s; s = strrchr(gca, '.'); diff --git a/gnu/usr.bin/cvs/lib/system.h b/gnu/usr.bin/cvs/lib/system.h index 3f69ca5..1f35065 100644 --- a/gnu/usr.bin/cvs/lib/system.h +++ b/gnu/usr.bin/cvs/lib/system.h @@ -97,7 +97,7 @@ extern long timezone; ** On most systems MAXPATHLEN is defined in sys/param.h to be 1024. Of ** those that this is not true, again most define PATH_MAX in limits.h ** or sys/limits.h which usually gets included by limits.h. On the few -** remaining systems that neither statement is true, _POSIX_PATH_MAX +** remaining systems that neither statement is true, _POSIX_PATH_MAX ** is defined. ** ** So: @@ -125,7 +125,7 @@ extern long timezone; /* On MOST systems this will get you MAXPATHLEN */ #include <sys/param.h> -#ifndef PATH_MAX +#ifndef PATH_MAX # ifdef MAXPATHLEN # define PATH_MAX MAXPATHLEN # else @@ -232,10 +232,10 @@ char *getwd (); #endif #ifdef HAVE_SYS_DIR_H #include <sys/dir.h> -#endif +#endif #ifdef HAVE_NDIR_H #include <ndir.h> -#endif +#endif #endif /* not (DIRENT or _POSIX_VERSION) */ /* Convert B 512-byte blocks to kilobytes if K is nonzero, diff --git a/gnu/usr.bin/cvs/lib/version.c b/gnu/usr.bin/cvs/lib/version.c index 557d00a..071b112 100644 --- a/gnu/usr.bin/cvs/lib/version.c +++ b/gnu/usr.bin/cvs/lib/version.c @@ -3,10 +3,10 @@ * Copyright (c) 1994 Free Software Foundation, Inc. * Copyright (c) 1992, Brian Berliner and Jeff Polk * Copyright (c) 1989-1992, Brian Berliner - * + * * You may distribute under the terms of the GNU General Public License as * specified in the README file that comes with this CVS source distribution. - * + * * version.c - the CVS version number */ |