summaryrefslogtreecommitdiffstats
path: root/sbin
diff options
context:
space:
mode:
Diffstat (limited to 'sbin')
-rw-r--r--sbin/dump/Makefile1
-rw-r--r--sbin/dump/dump.82
-rw-r--r--sbin/dump/main.c8
-rw-r--r--sbin/restore/Makefile1
-rw-r--r--sbin/restore/main.c13
-rw-r--r--sbin/restore/restore.811
6 files changed, 15 insertions, 21 deletions
diff --git a/sbin/dump/Makefile b/sbin/dump/Makefile
index d758d2e..2dd6fda 100644
--- a/sbin/dump/Makefile
+++ b/sbin/dump/Makefile
@@ -16,7 +16,6 @@
PROG= dump
LINKS= ${BINDIR}/dump ${BINDIR}/rdump
CFLAGS+=-DRDUMP
-CFLAGS+=-I${.CURDIR}/../../libexec/rlogind
WARNS= 0
SRCS= itime.c main.c optr.c dumprmt.c tape.c traverse.c unctime.c cache.c
MAN= dump.8
diff --git a/sbin/dump/dump.8 b/sbin/dump/dump.8
index 9954bf3..fa1174e 100644
--- a/sbin/dump/dump.8
+++ b/sbin/dump/dump.8
@@ -42,7 +42,7 @@
.Nd file system backup
.Sh SYNOPSIS
.Nm
-.Op Fl 0123456789ackLnSu
+.Op Fl 0123456789acLnSu
.Op Fl B Ar records
.Op Fl b Ar blocksize
.Op Fl C Ar cachesize
diff --git a/sbin/dump/main.c b/sbin/dump/main.c
index 5eb21ab..6866eb7 100644
--- a/sbin/dump/main.c
+++ b/sbin/dump/main.c
@@ -126,9 +126,8 @@ main(int argc, char *argv[])
usage();
obsolete(&argc, &argv);
-#define optstring "0123456789aB:b:C:cD:d:f:h:LnSs:T:uWw"
- while ((ch = getopt(argc, argv, optstring)) != -1)
-#undef optstring
+ while ((ch = getopt(argc, argv,
+ "0123456789aB:b:C:cD:d:f:h:LnSs:T:uWw")) != -1)
switch (ch) {
/* dump level */
case '0': case '1': case '2': case '3': case '4':
@@ -561,8 +560,7 @@ static void
usage(void)
{
fprintf(stderr,
- "usage: dump [-0123456789ac"
- "LnSu] [-B records] [-b blocksize] [-C cachesize]\n"
+ "usage: dump [-0123456789acLnSu] [-B records] [-b blocksize] [-C cachesize]\n"
" [-D dumpdates] [-d density] [-f file] [-h level] [-s feet]\n"
" [-T date] filesystem\n"
" dump -W | -w\n");
diff --git a/sbin/restore/Makefile b/sbin/restore/Makefile
index 712bf64..5571947 100644
--- a/sbin/restore/Makefile
+++ b/sbin/restore/Makefile
@@ -6,7 +6,6 @@
PROG= restore
LINKS= ${BINDIR}/restore ${BINDIR}/rrestore
CFLAGS+=-DRRESTORE
-CFLAGS+=-I${.CURDIR}/../../libexec/rlogind
WARNS= 0
SRCS= main.c interactive.c restore.c dirs.c symtab.c tape.c utilities.c \
dumprmt.c
diff --git a/sbin/restore/main.c b/sbin/restore/main.c
index 17abadb..4fe2be6 100644
--- a/sbin/restore/main.c
+++ b/sbin/restore/main.c
@@ -97,8 +97,7 @@ main(int argc, char *argv[])
if ((inputdev = getenv("TAPE")) == NULL)
inputdev = _PATH_DEFTAPE;
obsolete(&argc, &argv);
-#define optlist "b:df:himNRrs:tuvxy"
- while ((ch = getopt(argc, argv, optlist)) != -1)
+ while ((ch = getopt(argc, argv, "b:df:himNRrs:tuvxy")) != -1)
switch(ch) {
case 'b':
/* Change default tape blocksize. */
@@ -280,11 +279,11 @@ static void
usage()
{
(void)fprintf(stderr, "usage:\t%s\n\t%s\n\t%s\n\t%s\n\t%s\n",
- "restore -i [-cdhkmNuvy] [-b blocksize] [-f file] [-s fileno]",
- "restore -r [-cdkNuvy] [-b blocksize] [-f file] [-s fileno]",
- "restore -R [-cdkNuvy] [-b blocksize] [-f file] [-s fileno]",
- "restore -x [-cdhkmNuvy] [-b blocksize] [-f file] [-s fileno] [file ...]",
- "restore -t [-cdhkNuvy] [-b blocksize] [-f file] [-s fileno] [file ...]");
+ "restore -i [-cdhmNuvy] [-b blocksize] [-f file] [-s fileno]",
+ "restore -r [-cdNuvy] [-b blocksize] [-f file] [-s fileno]",
+ "restore -R [-cdNuvy] [-b blocksize] [-f file] [-s fileno]",
+ "restore -x [-cdhmNuvy] [-b blocksize] [-f file] [-s fileno] [file ...]",
+ "restore -t [-cdhNuvy] [-b blocksize] [-f file] [-s fileno] [file ...]");
done(1);
}
diff --git a/sbin/restore/restore.8 b/sbin/restore/restore.8
index d357785..6836536 100644
--- a/sbin/restore/restore.8
+++ b/sbin/restore/restore.8
@@ -42,32 +42,32 @@
.Sh SYNOPSIS
.Nm
.Fl i
-.Op Fl cdhkmNuvy
+.Op Fl cdhmNuvy
.Op Fl b Ar blocksize
.Op Fl f Ar file
.Op Fl s Ar fileno
.Nm
.Fl R
-.Op Fl cdkNuvy
+.Op Fl cdNuvy
.Op Fl b Ar blocksize
.Op Fl f Ar file
.Op Fl s Ar fileno
.Nm
.Fl r
-.Op Fl cdkNuvy
+.Op Fl cdNuvy
.Op Fl b Ar blocksize
.Op Fl f Ar file
.Op Fl s Ar fileno
.Nm
.Fl t
-.Op Fl cdhkNuvy
+.Op Fl cdhNuvy
.Op Fl b Ar blocksize
.Op Fl f Ar file
.Op Fl s Ar fileno
.Op Ar
.Nm
.Fl x
-.Op Fl cdhkmNuvy
+.Op Fl cdhmNuvy
.Op Fl b Ar blocksize
.Op Fl f Ar file
.Op Fl s Ar fileno
@@ -308,7 +308,6 @@ or
.Nm
reads from the named file on the remote host using
.Xr rmt 8 .
-.Pp
.It Fl h
Extract the actual directory,
rather than the files that it references.
OpenPOWER on IntegriCloud