From 188803394908f222ab3ed8ec32331eb6dd00fd2d Mon Sep 17 00:00:00 2001 From: rgrimes Date: Tue, 30 May 1995 00:07:29 +0000 Subject: Remove trailing whitespace. Reviewed by: phk --- bin/pax/ar_io.c | 30 +++++++++++++++--------------- bin/pax/ar_subs.c | 20 ++++++++++---------- bin/pax/buf_subs.c | 18 +++++++++--------- bin/pax/cpio.c | 6 +++--- bin/pax/cpio.h | 10 +++++----- bin/pax/file_subs.c | 12 ++++++------ bin/pax/ftree.c | 8 ++++---- bin/pax/gen_subs.c | 12 ++++++------ bin/pax/pat_rep.c | 28 ++++++++++++++-------------- bin/pax/pax.c | 24 ++++++++++++------------ bin/pax/pax.h | 8 ++++---- bin/pax/tables.c | 28 ++++++++++++++-------------- bin/pax/tables.h | 4 ++-- bin/pax/tar.c | 16 ++++++++-------- 14 files changed, 112 insertions(+), 112 deletions(-) (limited to 'bin/pax') diff --git a/bin/pax/ar_io.c b/bin/pax/ar_io.c index 69cd48e..e3481bd 100644 --- a/bin/pax/ar_io.c +++ b/bin/pax/ar_io.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: ar_io.c,v 1.2 1994/09/24 02:56:11 davidg Exp $ */ #ifndef lint @@ -278,7 +278,7 @@ ar_open(name) break; default: /* - * should never happen, worse case, slow... + * should never happen, worse case, slow... */ blksz = rdblksz = BLKMULT; break; @@ -458,8 +458,8 @@ ar_set_wr() * will stop us if the archive containing the trailer was not written */ wr_trail = 0; - - /* + + /* * Add any device dependent code as required here */ if (artyp != ISREG) @@ -480,7 +480,7 @@ ar_set_wr() /* * ar_app_ok() * check if the last volume in the archive allows appends. We cannot check - * this until we are ready to write since there is no spec that says all + * this until we are ready to write since there is no spec that says all * volumes in a single archive have to be of the same type... * Return: * 0 if we can append, -1 otherwise. @@ -592,7 +592,7 @@ ar_read(buf, cnt) else warn(0, "End of archive volume %d reached", arvol); return(res); -} +} /* * ar_write() @@ -710,8 +710,8 @@ ar_write(buf, bsz) warn(1,"Unable to append, trailer re-write failed. Quitting."); return(res); } - - if (res == 0) + + if (res == 0) warn(0, "End of archive volume %d reached", arvol); else if (res < 0) syswarn(1, errno, "Failed write to archive volume: %d", arvol); @@ -791,7 +791,7 @@ ar_rdsync() if ((cpos = lseek(arfd, (off_t)0L, SEEK_CUR)) < 0) break; mpos = fsbz - (cpos % (off_t)fsbz); - if (lseek(arfd, mpos, SEEK_CUR) < 0) + if (lseek(arfd, mpos, SEEK_CUR) < 0) break; lstrval = 1; break; @@ -850,14 +850,14 @@ ar_fow(sksz, skipped) * number of physical blocks to skip (we do not know physical block * size at this point), so we must only read foward on tapes! */ - if (artyp != ISREG) + if (artyp != ISREG) return(0); /* * figure out where we are in the archive */ if ((cpos = lseek(arfd, (off_t)0L, SEEK_CUR)) >= 0) { - /* + /* * we can be asked to move farther than there are bytes in this * volume, if so, just go to file end and let normal buf_fill() * deal with the end of file (it will go to next volume by @@ -898,7 +898,7 @@ ar_rev(sksz) { off_t cpos; struct mtop mb; - register int phyblk; + register int phyblk; /* * make sure we do not have try to reverse on a flawed archive @@ -908,7 +908,7 @@ ar_rev(sksz) switch(artyp) { case ISPIPE: - if (sksz <= 0) + if (sksz <= 0) break; /* * cannot go backwards on these critters @@ -1017,7 +1017,7 @@ ar_rev(sksz) /* * get_phys() * Determine the physical block size on a tape drive. We need the physical - * block size so we know how many bytes we skip over when we move with + * block size so we know how many bytes we skip over when we move with * mtio commands. We also make sure we are BEFORE THE TAPE FILEMARK when * return. * This is one really SLOW routine... @@ -1218,7 +1218,7 @@ ar_next() /* * we are to continue with the same device */ - if (ar_open(arcname) >= 0) + if (ar_open(arcname) >= 0) return(0); tty_prnt("Cannot re-open %s, try again\n", arcname); diff --git a/bin/pax/ar_subs.c b/bin/pax/ar_subs.c index 86ad0f8..c725fe8 100644 --- a/bin/pax/ar_subs.c +++ b/bin/pax/ar_subs.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: ar_subs.c,v 1.2 1994/09/24 02:56:12 davidg Exp $ */ #ifndef lint @@ -449,7 +449,7 @@ wr_archive(arcn, is_app) if ((res > 0) || (docrc && (set_crc(arcn, fd) < 0))) { /* * unable to obtain the crc we need, close the file, - * purge link table entry + * purge link table entry */ rdfile_close(arcn, &fd); purg_lnk(arcn); @@ -472,7 +472,7 @@ wr_archive(arcn, is_app) } wr_one = 1; if (res > 0) { - /* + /* * format write says no file data needs to be stored * so we are done messing with this file */ @@ -535,7 +535,7 @@ wr_archive(arcn, is_app) * is called to add the new members. * PAX IMPLEMENTATION DETAIL NOTE: * -u is implemented by adding the new members to the end of the archive. - * Care is taken so that these do not end up as links to the older + * Care is taken so that these do not end up as links to the older * version of the same file already stored in the archive. It is expected * when extraction occurs these newer versions will over-write the older * ones stored "earlier" in the archive (this may be a bad assumption as @@ -677,7 +677,7 @@ append() (void)fputs("done.\n", stderr); vfpart = 0; } - + /* * go to the writing phase to add the new members */ @@ -765,7 +765,7 @@ copy() /* * start up the hard link table; file traversal routines and the - * modification time and access mode database + * modification time and access mode database */ if ((lnk_start() < 0) || (ftree_start() < 0) || (dir_start() < 0)) return; @@ -881,7 +881,7 @@ copy() * try to create a hard link to the src file if requested * but make sure we are not trying to overwrite ourselves. */ - if (lflag) + if (lflag) res = cross_lnk(arcn); else res = chk_same(arcn); @@ -988,7 +988,7 @@ next_head(arcn) register int hsz; register int in_resync = 0; /* set when we are in resync mode */ int cnt = 0; /* counter for trailer function */ - + /* * set up initial conditions, we want a whole frmt->hsz block as we * have no data yet. @@ -1132,7 +1132,7 @@ get_arc() register int minhd = BLKMULT; char *hdend; int notice = 0; - + /* * find the smallest header size in all archive formats and then set up * to read the archive. @@ -1192,7 +1192,7 @@ get_arc() if ((*fsub[ford[i]].id)(hdbuf, hdsz) < 0) continue; frmt = &(fsub[ford[i]]); - /* + /* * yuck, to avoid slow special case code in the extract * routines, just push this header back as if it was * not seen. We have left extra space at start of the diff --git a/bin/pax/buf_subs.c b/bin/pax/buf_subs.c index fdf44ab..b8b6a8c 100644 --- a/bin/pax/buf_subs.c +++ b/bin/pax/buf_subs.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: buf_subs.c,v 1.2 1994/09/24 02:56:13 davidg Exp $ */ #ifndef lint @@ -101,7 +101,7 @@ wr_start() * archive that might be hard to read elsewhere. If all ok, we then * open the first archive volume */ - if (!wrblksz) + if (!wrblksz) wrblksz = frmt->bsz; if (wrblksz > MAXBLK) { warn(1, "Write block size of %d too large, maximium is: %d", @@ -115,7 +115,7 @@ wr_start() } /* - * we only allow wrblksz to be used with all archive operations + * we only allow wrblksz to be used with all archive operations */ blksz = rdblksz = wrblksz; if ((ar_open(arcname) < 0) && (ar_next() < 0)) @@ -215,7 +215,7 @@ cp_start() * about the conditions under which they will allow a write to occur. * Often devices restrict the conditions where writes can be made writes, * so it may not be feasable to append archives stored on all types of - * devices. + * devices. * Return: * 0 for success, -1 for failure */ @@ -313,7 +313,7 @@ appnd_start(skcnt) warn(1, "Unable to rewrite archive trailer, cannot append."); return(-1); } - + /* * rd_sync() * A read error occurred on this archive volume. Resync the buffer and @@ -488,7 +488,7 @@ rd_skip(skcnt) return(0); } -/* +/* * wr_fin() * flush out any data (and pad if required) the last block. We always pad * with zero (even though we do not have to). Padding with 0 makes it a @@ -517,7 +517,7 @@ wr_fin() * by format specific write routines to pass a file header). On failure we * punt. We do not allow the user to continue to write flawed archives. * We assume these headers are not very large (the memory copy we use is - * a bit expensive). + * a bit expensive). * Return: * 0 if buffer was filled ok, -1 o.w. (buffer flush failure) */ @@ -810,7 +810,7 @@ rd_wrfile(arcn, ofd, left) /* * if we failed from archive read, we do not want to skip */ - if ((size > 0L) && (*left == 0L)) + if ((size > 0L) && (*left == 0L)) return(-1); /* @@ -1019,7 +1019,7 @@ buf_flush(bufcnt) /* * write a block and check if it all went out ok */ - cnt = ar_write(buf, blksz); + cnt = ar_write(buf, blksz); if (cnt == blksz) { /* * the write went ok diff --git a/bin/pax/cpio.c b/bin/pax/cpio.c index 1669e6e..0307c54 100644 --- a/bin/pax/cpio.c +++ b/bin/pax/cpio.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: cpio.c,v 1.2 1994/09/24 02:56:16 davidg Exp $ */ #ifndef lint @@ -93,7 +93,7 @@ cpio_strd() * mode; looking for a valid header), and cnt (which starts at zero) * which is used to count the number of empty blocks we have seen so far. * Return: - * 0 if a valid trailer, -1 if not a valid trailer, + * 0 if a valid trailer, -1 if not a valid trailer, */ #if __STDC__ @@ -572,7 +572,7 @@ cpio_wr(arcn) /* * vcpio_id() * determine if a block given to us is a valid system VR4 cpio header - * WITHOUT crc. WATCH it the magic cookies are in OCTAL, the header + * WITHOUT crc. WATCH it the magic cookies are in OCTAL, the header * uses HEX * Return: * 0 if a valid header, -1 otherwise diff --git a/bin/pax/cpio.h b/bin/pax/cpio.h index f3b11fb..6e50048 100644 --- a/bin/pax/cpio.h +++ b/bin/pax/cpio.h @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * @(#)cpio.h 8.1 (Berkeley) 5/31/93 - * $Id$ + * $Id: cpio.h,v 1.2 1994/09/24 02:56:17 davidg Exp $ */ /* @@ -71,7 +71,7 @@ typedef struct { char c_mtime[11]; /* modification time */ char c_namesize[6]; /* length of pathname */ char c_filesize[11]; /* length of file in bytes */ -} HD_CPIO; +} HD_CPIO; #define MAGIC 070707 /* transportable archive id */ @@ -82,7 +82,7 @@ typedef struct { #endif /* _PAX_ */ /* - * Binary cpio header structure + * Binary cpio header structure * * CAUTION! CAUTION! CAUTION! * Each field really represents a 16 bit short (NOT ASCII). Described as @@ -102,7 +102,7 @@ typedef struct { u_char h_namesize[2]; u_char h_filesize_1[2]; u_char h_filesize_2[2]; -} HD_BCPIO; +} HD_BCPIO; #ifdef _PAX_ /* @@ -140,7 +140,7 @@ typedef struct { char c_rmin[8]; /* special file minor # */ char c_namesize[8]; /* length of pathname */ char c_chksum[8]; /* 0 OR CRC of bytes of FILE data */ -} HD_VCPIO; +} HD_VCPIO; #define VMAGIC 070701 /* sVr4 new portable archive id */ #define VCMAGIC 070702 /* sVr4 new portable archive id CRC */ diff --git a/bin/pax/file_subs.c b/bin/pax/file_subs.c index 16c9969..f220639 100644 --- a/bin/pax/file_subs.c +++ b/bin/pax/file_subs.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: file_subs.c,v 1.2 1994/09/24 02:56:19 davidg Exp $ */ #ifndef lint @@ -159,7 +159,7 @@ file_close(arcn, fd) /* * set owner/groups first as this may strip off mode bits we want * then set file permission modes. Then set file access and - * modification times. + * modification times. */ if (pids) res = set_ids(arcn->name, arcn->sb.st_uid, arcn->sb.st_gid); @@ -180,7 +180,7 @@ file_close(arcn, fd) /* * lnk_creat() * Create a hard link to arcn->ln_name from arcn->name. arcn->ln_name - * must exist; + * must exist; * Return: * 0 if ok, -1 otherwise */ @@ -266,7 +266,7 @@ chk_same(arcn) { struct stat sb; - /* + /* * if file does not exist, return. if file exists and -k, skip it * quietly */ @@ -570,7 +570,7 @@ unlnk_exist(name, type) */ if (rmdir(name) < 0) { if (type == PAX_DIR) - return(1); + return(1); syswarn(1,errno,"Unable to remove directory %s", name); return(-1); } @@ -847,7 +847,7 @@ file_write(fd, str, cnt, rem, isempt, sz, name) register char *end; register int wcnt; register char *st = str; - + /* * while we have data to process */ diff --git a/bin/pax/ftree.c b/bin/pax/ftree.c index 037c070..6f2b14b 100644 --- a/bin/pax/ftree.c +++ b/bin/pax/ftree.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: ftree.c,v 1.2 1994/09/24 02:56:20 davidg Exp $ */ #ifndef lint @@ -214,7 +214,7 @@ ftree_sel(arcn) * when file trees are supplied pax as args. The list is not used when * the trees are read from stdin. */ - if (ftcur != NULL) + if (ftcur != NULL) ftcur->refcnt = 1; /* @@ -307,7 +307,7 @@ ftree_arg() if (fthead == NULL) { /* * the user didn't supply any args, get the file trees - * to process from stdin; + * to process from stdin; */ if (fgets(farray[0], PAXPATHLEN+1, stdin) == NULL) return(-1); @@ -362,7 +362,7 @@ next_file(arcn) /* * ftree_sel() might have set the ftree_skip flag if the user has the * -n option and a file was selected from this file arg tree. (-n says - * only one member is matched for each pattern) ftree_skip being 1 + * only one member is matched for each pattern) ftree_skip being 1 * forces us to go to the next arg now. */ if (ftree_skip) { diff --git a/bin/pax/gen_subs.c b/bin/pax/gen_subs.c index d80a2be..42be017 100644 --- a/bin/pax/gen_subs.c +++ b/bin/pax/gen_subs.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: gen_subs.c,v 1.2 1994/09/24 02:56:22 davidg Exp $ + * $Id: gen_subs.c,v 1.3 1995/03/19 13:28:49 joerg Exp $ */ #ifndef lint @@ -203,7 +203,7 @@ ls_tty(arcn) /* * zf_strncpy() * copy src to dest up to len chars (stopping at first '\0'), when src is - * shorter than len, pads to len with '\0'. big performance win (and + * shorter than len, pads to len with '\0'. big performance win (and * a lot easier to code) over strncpy(), then a strlen() then a * bzero(). (or doing the bzero() first). */ @@ -335,7 +335,7 @@ ul_asc(val, str, len, base) { register char *pt; u_long digit; - + /* * WARNING str is not '\0' terminated by this routine */ @@ -350,7 +350,7 @@ ul_asc(val, str, len, base) while (pt >= str) { if ((digit = (val & 0xf)) < 10) *pt-- = '0' + (char)digit; - else + else *pt-- = 'a' + (char)(digit - 10); if ((val = (val >> 4)) == (u_long)0) break; @@ -449,7 +449,7 @@ uqd_asc(val, str, len, base) { register char *pt; u_quad_t digit; - + /* * WARNING str is not '\0' terminated by this routine */ @@ -464,7 +464,7 @@ uqd_asc(val, str, len, base) while (pt >= str) { if ((digit = (val & 0xf)) < 10) *pt-- = '0' + (char)digit; - else + else *pt-- = 'a' + (char)(digit - 10); if ((val = (val >> 4)) == (u_quad_t)0) break; diff --git a/bin/pax/pat_rep.c b/bin/pax/pat_rep.c index 546a945..aadd17c 100644 --- a/bin/pax/pat_rep.c +++ b/bin/pax/pat_rep.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pat_rep.c,v 1.2 1994/09/24 02:56:24 davidg Exp $ + * $Id: pat_rep.c,v 1.3 1995/03/19 13:28:56 joerg Exp $ */ #ifndef lint @@ -88,7 +88,7 @@ static int resub __P((regex_t *, regmatch_t *, char *, char *, char *)); * parses the -s replacement string; compiles the regular expression * and stores the compiled value and it's replacement string together in * replacement string list. Input to this function is of the form: - * /old/new/pg + * /old/new/pg * The first char in the string specifies the delimiter used by this * replacement string. "Old" is a regular expression in "ed" format which * is compiled by regcomp() and is applied to filenames. "new" is the @@ -348,7 +348,7 @@ pat_sel(arcn) /* * we reach this point only when we allow a single selected match per - * pattern, if the pattern matches a directory and we do not have -d + * pattern, if the pattern matches a directory and we do not have -d * (dflag) we are done with this pattern. We may also be handed a file * in the subtree of a directory. in that case when we are operating * with -d, this pattern was already selected and we are done @@ -372,7 +372,7 @@ pat_sel(arcn) */ if (pt->pend != NULL) *pt->pend = '\0'; - + if ((pt->pstr = strdup(arcn->name)) == NULL) { warn(1, "Pattern select out of memory"); if (pt->pend != NULL) @@ -397,7 +397,7 @@ pat_sel(arcn) if (*(pt->pstr + len) == '/') { *(pt->pstr + len) = '\0'; pt->plen = len; - } + } pt->flgs = DIR_MTCH | MTCH; arcn->pat = pt; return(0); @@ -438,7 +438,7 @@ pat_sel(arcn) * this archive member is "selected" we process and mark the pattern as * one which matched a selected archive member (see pat_sel()) * Return: - * 0 if this archive member should be processed, 1 if it should be + * 0 if this archive member should be processed, 1 if it should be * skipped and -1 if we are done with all patterns (and pax should quit * looking for more members) */ @@ -515,7 +515,7 @@ pat_match(arcn) /* * fn_match() * Return: - * 0 if this archive member should be processed, 1 if it should be + * 0 if this archive member should be processed, 1 if it should be * skipped and -1 if we are done with all patterns (and pax should quit * looking for more members) * Note: *pend may be changed to show where the prefix ends. @@ -564,7 +564,7 @@ fn_match(pattern, string, pend) case '*': c = *pattern; /* - * Collapse multiple *'s. + * Collapse multiple *'s. */ while (c == '*') c = *++pattern; @@ -649,7 +649,7 @@ range_match(pattern, test) * if we spot any file links to the old file name in the future, we will * know exactly how to fix the file link. * Return: - * 0 continue to process file, 1 skip this file, -1 pax is finished + * 0 continue to process file, 1 skip this file, -1 pax is finished */ #if __STDC__ @@ -862,7 +862,7 @@ fix_path(or_name, or_len, dir_name, dir_len) *or_len = len; /* - * enough space, shift + * enough space, shift */ while (src >= start) *dest-- = *src--; @@ -1014,7 +1014,7 @@ rep_name(name, nlen, prnt) */ } while (pt->flgs & GLOB); - if (found) + if (found) break; /* @@ -1037,7 +1037,7 @@ rep_name(name, nlen, prnt) warn(1,"Replacement name too long %s >> %s", name, nname); return(1); - } + } /* * inform the user of the result if wanted @@ -1046,7 +1046,7 @@ rep_name(name, nlen, prnt) if (*nname == '\0') (void)fprintf(stderr,"%s >> \n", name); - else + else (void)fprintf(stderr,"%s >> %s\n", name, nname); } @@ -1054,7 +1054,7 @@ rep_name(name, nlen, prnt) * if empty inform the caller this file is to be skipped * otherwise copy the new name over the orig name and return */ - if (*nname == '\0') + if (*nname == '\0') return(1); *nlen = l_strncpy(name, nname, PAXPATHLEN + 1); } diff --git a/bin/pax/pax.c b/bin/pax/pax.c index 880eeda..2bdf6bd 100644 --- a/bin/pax/pax.c +++ b/bin/pax/pax.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: pax.c,v 1.2 1994/09/24 02:56:27 davidg Exp $ */ #ifndef lint @@ -116,7 +116,7 @@ sigset_t s_mask; /* signal mask for cleanup critical sect */ * * 1 READ ENHANCEMENTS * 1.1 Operations which read archives will continue to operate even when - * processing archives which may be damaged, truncated, or fail to meet + * processing archives which may be damaged, truncated, or fail to meet * format specs in several different ways. Damaged sections of archives * are detected and avoided if possible. Attempts will be made to resync * archive read operations even with badly damaged media. @@ -131,7 +131,7 @@ sigset_t s_mask; /* signal mask for cleanup critical sect */ * 1.5 The user is notified whenever something is found during archive * read operations which violates spec (but the read will continue). * 1.6 Multiple archive volumes can be read and may span over different - * archive devices + * archive devices * 1.7 Rigidly restores all file attributes exactly as they are stored on the * archive. * 1.8 Modification change time ranges can be specified via multiple -T @@ -157,7 +157,7 @@ sigset_t s_mask; /* signal mask for cleanup critical sect */ * these fields. This removes any restrictions on using these archive * formats on large file systems. * 2.5 Multiple archive volumes can be written and may span over different - * archive devices + * archive devices * 2.6 A archive volume record limit allows the user to specify the number * of bytes stored on an archive volume. When reached the user is * prompted for the next archive volume. This is specified with the @@ -204,7 +204,7 @@ sigset_t s_mask; /* signal mask for cleanup critical sect */ * name modification (-Z) * * 4 GENERAL ENHANCEMENTS - * 4.1 Internal structure is designed to isolate format dependent and + * 4.1 Internal structure is designed to isolate format dependent and * independent functions. Formats are selected via a format driver table. * This encourages the addition of new archive formats by only having to * write those routines which id, read and write the archive header. @@ -235,7 +235,7 @@ main(argc, argv) return(exit_val); /* - * select a primary operation mode + * select a primary operation mode */ switch(act) { case EXTRACT: @@ -349,7 +349,7 @@ gen_init() /* * Handle posix locale * - * set user defines time printing format for -v option + * set user defines time printing format for -v option */ ltmfrmt = getenv("LC_TIME"); @@ -371,27 +371,27 @@ gen_init() n_hand.sa_handler = sig_cleanup; if ((sigaction(SIGHUP, &n_hand, &o_hand) < 0) && - (o_hand.sa_handler == SIG_IGN) && + (o_hand.sa_handler == SIG_IGN) && (sigaction(SIGHUP, &o_hand, &o_hand) < 0)) goto out; if ((sigaction(SIGTERM, &n_hand, &o_hand) < 0) && - (o_hand.sa_handler == SIG_IGN) && + (o_hand.sa_handler == SIG_IGN) && (sigaction(SIGTERM, &o_hand, &o_hand) < 0)) goto out; if ((sigaction(SIGINT, &n_hand, &o_hand) < 0) && - (o_hand.sa_handler == SIG_IGN) && + (o_hand.sa_handler == SIG_IGN) && (sigaction(SIGINT, &o_hand, &o_hand) < 0)) goto out; if ((sigaction(SIGQUIT, &n_hand, &o_hand) < 0) && - (o_hand.sa_handler == SIG_IGN) && + (o_hand.sa_handler == SIG_IGN) && (sigaction(SIGQUIT, &o_hand, &o_hand) < 0)) goto out; if ((sigaction(SIGXCPU, &n_hand, &o_hand) < 0) && - (o_hand.sa_handler == SIG_IGN) && + (o_hand.sa_handler == SIG_IGN) && (sigaction(SIGXCPU, &o_hand, &o_hand) < 0)) goto out; diff --git a/bin/pax/pax.h b/bin/pax/pax.h index c63cb3e..450cd6b 100644 --- a/bin/pax/pax.h +++ b/bin/pax/pax.h @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * @(#)pax.h 8.2 (Berkeley) 4/18/94 - * $Id$ + * $Id: pax.h,v 1.2 1994/09/24 02:56:28 davidg Exp $ */ /* @@ -63,7 +63,7 @@ #define DEFOP LIST /* if no flags default is to LIST */ /* - * Device type of the current archive volume + * Device type of the current archive volume */ #define ISREG 0 /* regular file */ #define ISCHR 1 /* character device */ @@ -76,7 +76,7 @@ * * The format specific routine table allows new archive formats to be quickly * added. Overall pax operation is independent of the actual format used to - * form the archive. Only those routines which deal directly with the archive + * form the archive. Only those routines which deal directly with the archive * are tailored to the oddities of the specifc format. All other routines are * independent of the archive format. Data flow in and out of the format * dependent routines pass pointers to ARCHD structure (described below). @@ -207,7 +207,7 @@ typedef struct { #define PAX_FIF 7 /* fifo */ #define PAX_HLK 8 /* hard link */ #define PAX_HRG 9 /* hard link to a regular file */ -#define PAX_CTG 10 /* high performance file */ +#define PAX_CTG 10 /* high performance file */ } ARCHD; /* diff --git a/bin/pax/tables.c b/bin/pax/tables.c index ea6d4e8..c3ccc1c 100644 --- a/bin/pax/tables.c +++ b/bin/pax/tables.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: tables.c,v 1.2 1994/09/24 02:56:34 davidg Exp $ */ #ifndef lint @@ -85,7 +85,7 @@ static DEVT *chk_dev __P((dev_t, int)); /* * hard link table routines * - * The hard link table tries to detect hard links to files using the device and + * The hard link table tries to detect hard links to files using the device and * inode values. We do this when writing an archive, so we can tell the format * write routine that this file is a hard link to another file. The format * write routine then can store this file in whatever way it wants (as a hard @@ -333,10 +333,10 @@ lnk_end() * that this is one HUGE database. To save memory space, the actual file names * are stored in a scatch file and indexed by an in memory hash table. The * hash table is indexed by hashing the file path. The nodes in the table store - * the length of the filename and the lseek offset within the scratch file + * the length of the filename and the lseek offset within the scratch file * where the actual name is stored. Since there are never any deletions to this * table, fragmentation of the scratch file is never a issue. Lookups seem to - * not exhibit any locality at all (files in the database are rarely + * not exhibit any locality at all (files in the database are rarely * looked up more than once...). So caching is just a waste of memory. The * only limitation is the amount of scatch file space available to store the * path names. @@ -468,7 +468,7 @@ chk_ftime(arcn) */ pt->mtime = arcn->sb.st_mtime; return(0); - } + } /* * file is older */ @@ -493,7 +493,7 @@ chk_ftime(arcn) return(0); } syswarn(1, errno, "Failed write to file time table"); - } else + } else syswarn(1, errno, "Failed seek on file time table"); } else warn(1, "File time table ran out of memory"); @@ -567,7 +567,7 @@ add_name(oname, onamelen, nname) * should never happen */ warn(0, "No interactive rename table, links may fail\n"); - return(0); + return(0); } /* @@ -666,7 +666,7 @@ sub_name(oname, onamelen) */ return; } - + /* * device/inode mapping table routines * (used with formats that store device and inodes fields) @@ -856,7 +856,7 @@ map_dev(arcn, dev_mask, ino_mask) return(0); /* * check for device and inode truncation, and extract the truncated - * bit pattern. + * bit pattern. */ if ((arcn->sb.st_dev & (dev_t)dev_mask) != arcn->sb.st_dev) ++trc_dev; @@ -1064,7 +1064,7 @@ add_atdir(fname, dev, ino, mtime, atime) return; /* - * make sure this directory is not already in the table, if so just + * make sure this directory is not already in the table, if so just * return (the older entry always has the correct time). The only * way this will happen is when the same subtree can be traversed by * different args to pax and the -n option is aborting fts out of a @@ -1233,7 +1233,7 @@ dir_start() * name is name of the directory, psb the stat buffer with the data in it, * frc_mode is a flag that says whether to force the setting of the mode * (ignoring the user set values for preserving file mode). Frc_mode is - * for the case where we created a file and found that the resulting + * for the case where we created a file and found that the resulting * directory was not writeable and the user asked for file modes to NOT * be preserved. (we have to preserve what was created by default, so we * have to force the setting at the end. this is stated explicitly in the @@ -1312,15 +1312,15 @@ proc_dir() * read the trailer, then the file name, if this fails * just give up. */ - if (lseek(dirfd, -((off_t)sizeof(dblk)), SEEK_CUR) < 0) + if (lseek(dirfd, -((off_t)sizeof(dblk)), SEEK_CUR) < 0) break; if (read(dirfd,(char *)&dblk, sizeof(dblk)) != sizeof(dblk)) break; - if (lseek(dirfd, dblk.npos, SEEK_SET) < 0) + if (lseek(dirfd, dblk.npos, SEEK_SET) < 0) break; if (read(dirfd, name, dblk.nlen) != dblk.nlen) break; - if (lseek(dirfd, dblk.npos, SEEK_SET) < 0) + if (lseek(dirfd, dblk.npos, SEEK_SET) < 0) break; /* diff --git a/bin/pax/tables.h b/bin/pax/tables.h index bce60b0..d7ff769 100644 --- a/bin/pax/tables.h +++ b/bin/pax/tables.h @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * @(#)tables.h 8.1 (Berkeley) 5/31/93 - * $Id$ + * $Id: tables.h,v 1.2 1994/09/24 02:56:35 davidg Exp $ */ /* @@ -106,7 +106,7 @@ typedef struct namt { * this table. (When the inode field in the archive header are too small, we * remap the dev on writes to remove accidental collisions). * - * The list is hashed by device number using chain collision resolution. Off of + * The list is hashed by device number using chain collision resolution. Off of * each DEVT are linked the various remaps for this device based on those bits * in the inode which were truncated. For example if we are just remapping to * avoid a device number during an update append, off the DEVT we would have diff --git a/bin/pax/tar.c b/bin/pax/tar.c index e603d9b..fc5ca2f 100644 --- a/bin/pax/tar.c +++ b/bin/pax/tar.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: tar.c,v 1.2 1994/09/24 02:56:37 davidg Exp $ */ #ifndef lint @@ -182,7 +182,7 @@ ul_oct(val, str, len, term) #endif { register char *pt; - + /* * term selects the appropriate character(s) for the end of the string */ @@ -246,7 +246,7 @@ uqd_oct(val, str, len, term) #endif { register char *pt; - + /* * term selects the appropriate character(s) for the end of the string */ @@ -315,8 +315,8 @@ tar_chksm(blk, len) */ pt = blk; stop = blk + CHK_OFFSET; - while (pt < stop) - chksm += (u_long)(*pt++ & 0xff); + while (pt < stop) + chksm += (u_long)(*pt++ & 0xff); /* * move past the checksum field and keep going, spec counts the * checksum field as the sum of 8 blanks (which is pre-computed as @@ -327,7 +327,7 @@ tar_chksm(blk, len) pt += CHK_LEN; stop = blk + len; while (pt < stop) - chksm += (u_long)(*pt++ & 0xff); + chksm += (u_long)(*pt++ & 0xff); return(chksm); } @@ -532,7 +532,7 @@ tar_rd(arcn, buf) * strip off any trailing slash. */ if (*pt == '/') { - *pt = '\0'; + *pt = '\0'; --arcn->nlen; } return(0); @@ -1013,7 +1013,7 @@ ustar_wr(arcn) */ zf_strncpy(hd->name, pt, sizeof(hd->name)); - /* + /* * set the fields in the header that are type dependent */ switch(arcn->type) { -- cgit v1.1