summaryrefslogtreecommitdiffstats
path: root/sbin/restore
diff options
context:
space:
mode:
authorrgrimes <rgrimes@FreeBSD.org>1995-05-30 06:12:45 +0000
committerrgrimes <rgrimes@FreeBSD.org>1995-05-30 06:12:45 +0000
commitf3a2b348daf9fa6063c38d2d69563f732a2f80e7 (patch)
tree4d38911cf1e5e1ef56a662eddcbe2f706b2e6973 /sbin/restore
parentf05428e4cd63dde97bac14b84dd146a5c00455e3 (diff)
downloadFreeBSD-src-f3a2b348daf9fa6063c38d2d69563f732a2f80e7.zip
FreeBSD-src-f3a2b348daf9fa6063c38d2d69563f732a2f80e7.tar.gz
Remove trailing whitespace.
Diffstat (limited to 'sbin/restore')
-rw-r--r--sbin/restore/dirs.c6
-rw-r--r--sbin/restore/restore.c12
-rw-r--r--sbin/restore/symtab.c4
-rw-r--r--sbin/restore/tape.c14
-rw-r--r--sbin/restore/utilities.c2
5 files changed, 19 insertions, 19 deletions
diff --git a/sbin/restore/dirs.c b/sbin/restore/dirs.c
index 79c9897..8860f5b 100644
--- a/sbin/restore/dirs.c
+++ b/sbin/restore/dirs.c
@@ -207,7 +207,7 @@ skipdirs()
}
/*
- * Recursively find names and inumbers of all files in subtree
+ * Recursively find names and inumbers of all files in subtree
* pname and pass them off to be processed.
*/
void
@@ -477,7 +477,7 @@ rst_readdir(dirp)
for (;;) {
if (dirp->dd_loc == 0) {
- dirp->dd_size = read(dirp->dd_fd, dirp->dd_buf,
+ dirp->dd_size = read(dirp->dd_fd, dirp->dd_buf,
DIRBLKSIZ);
if (dirp->dd_size <= 0) {
dprintf(stderr, "error reading directory\n");
@@ -583,7 +583,7 @@ setdirmodes(flags)
struct modeinfo node;
struct entry *ep;
char *cp;
-
+
vprintf(stdout, "Set directory mode, owner, and times.\n");
(void) sprintf(modefile, "%s/rstmode%d", _PATH_TMP, dumpdate);
mf = fopen(modefile, "r");
diff --git a/sbin/restore/restore.c b/sbin/restore/restore.c
index dea964c..97bd6cc 100644
--- a/sbin/restore/restore.c
+++ b/sbin/restore/restore.c
@@ -130,7 +130,7 @@ deletefile(name, ino, type)
return (descend);
}
-/*
+/*
* The following four routines implement the incremental
* restore algorithm. The first removes old entries, the second
* does renames and calculates the extraction list, the third
@@ -139,7 +139,7 @@ deletefile(name, ino, type)
*
* Directories cannot be immediately deleted, as they may have
* other files in them which need to be moved out first. As
- * directories to be deleted are found, they are put on the
+ * directories to be deleted are found, they are put on the
* following deletion list. After all deletions and renames
* are done, this list is actually deleted.
*/
@@ -203,7 +203,7 @@ nodeupdates(name, ino, type)
# define MODECHG 0x8 /* mode of inode changed */
/*
- * This routine is called once for each element in the
+ * This routine is called once for each element in the
* directory hierarchy, with a full path name.
* The "type" value is incorrectly specified as LEAF for
* directories that are not on the dump tape.
@@ -394,7 +394,7 @@ nodeupdates(name, ino, type)
* that we need to rename, so we delete it from the symbol
* table, and put it on the list to be deleted eventually.
* Conversely if a directory is to be created, it must be
- * done immediately, rather than waiting until the
+ * done immediately, rather than waiting until the
* extraction phase.
*/
case ONTAPE|INOFND|MODECHG:
@@ -464,7 +464,7 @@ nodeupdates(name, ino, type)
default:
panic("[%s] %s: impossible state\n", keyval(key), name);
break;
- }
+ }
return (descend);
}
@@ -606,7 +606,7 @@ createleaves(symtabfile)
/*
* If we find files on the tape that have no corresponding
* directory entries, then we must have found a file that
- * was created while the dump was in progress. Since we have
+ * was created while the dump was in progress. Since we have
* no name for it, we discard it knowing that it will be
* on the next incremental tape.
*/
diff --git a/sbin/restore/symtab.c b/sbin/restore/symtab.c
index 3895ec0..9488a7f 100644
--- a/sbin/restore/symtab.c
+++ b/sbin/restore/symtab.c
@@ -366,7 +366,7 @@ removeentry(ep)
/*
* Table of unused string entries, sorted by length.
- *
+ *
* Entries are allocated in STRTBLINCR sized pieces so that names
* of similar lengths can use the same entry. The value of STRTBLINCR
* is chosen so that every entry has at least enough space to hold
@@ -422,7 +422,7 @@ freename(name)
char *name;
{
struct strhdr *tp, *np;
-
+
tp = &strtblhdr[strlen(name) / STRTBLINCR];
np = (struct strhdr *)name;
np->next = tp->next;
diff --git a/sbin/restore/tape.c b/sbin/restore/tape.c
index 965a28e..ebfa555 100644
--- a/sbin/restore/tape.c
+++ b/sbin/restore/tape.c
@@ -300,7 +300,7 @@ again:
if (command == 'R' || command == 'r' || curfile.action != SKIP) {
newvol = nextvol;
wantnext = 1;
- } else {
+ } else {
newvol = 0;
wantnext = 0;
}
@@ -398,7 +398,7 @@ gethdr:
* If coming to this volume at random, skip to the beginning
* of the next record.
*/
- dprintf(stdout, "read %ld recs, tape starts with %ld\n",
+ dprintf(stdout, "read %ld recs, tape starts with %ld\n",
tpblksread, tmpbuf.c_firstrec);
if (tmpbuf.c_type == TS_TAPE && (tmpbuf.c_flags & DR_NEWHEADER)) {
if (!wantnext) {
@@ -477,7 +477,7 @@ setdumpnum()
#ifdef RRESTORE
if (host)
rmtioctl(MTFSF, dumpnum - 1);
- else
+ else
#endif
if (ioctl(mt, (int)MTIOCTOP, (char *)&tcom) < 0)
fprintf(stderr, "ioctl MTFSF: %s\n", strerror(errno));
@@ -1094,7 +1094,7 @@ good:
break;
}
/*
- * If we are restoring a filesystem with old format inodes,
+ * If we are restoring a filesystem with old format inodes,
* copy the uid/gid to the new location.
*/
if (oldinofmt) {
@@ -1247,11 +1247,11 @@ checksum(buf)
} else {
/* What happens if we want to read restore tapes
for a 16bit int machine??? */
- do
+ do
i += swabl(*buf++);
while (--j);
}
-
+
if (i != CHECKSUM) {
fprintf(stderr, "Checksum error %o, inode %d file %s\n", i,
curfile.ino, curfile.name);
@@ -1328,7 +1328,7 @@ swabst(cp, sp)
case '5': case '6': case '7': case '8': case '9':
n = (n * 10) + (*cp++ - '0');
continue;
-
+
case 's': case 'w': case 'h':
if (n == 0)
n = 1;
diff --git a/sbin/restore/utilities.c b/sbin/restore/utilities.c
index 31fd11c..b2e442e 100644
--- a/sbin/restore/utilities.c
+++ b/sbin/restore/utilities.c
@@ -329,7 +329,7 @@ dirlookup(name)
{
struct direct *dp;
ino_t ino;
-
+
ino = ((dp = pathsearch(name)) == NULL) ? 0 : dp->d_ino;
if (ino == 0 || TSTINO(ino, dumpmap) == 0)
OpenPOWER on IntegriCloud