/tmp// -> /tmp/

diff --git a/sbin/restore/dirs.c b/sbin/restore/dirs.c
index 7b8dd51..e155582 100644 (file)
--- a/sbin/restore/dirs.c
+++ b/sbin/restore/dirs.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: dirs.c,v 1.7 1996/08/02 11:26:23 deraadt Exp $        */
+/*     $OpenBSD: dirs.c,v 1.8 1996/09/16 16:35:09 millert Exp $        */
 /*     $NetBSD: dirs.c,v 1.16 1995/06/19 00:20:11 cgd Exp $    */
 
 /*
@@ -43,7 +43,7 @@
 #if 0
 static char sccsid[] = "@(#)dirs.c     8.5 (Berkeley) 8/31/94";
 #else
-static char rcsid[] = "$OpenBSD: dirs.c,v 1.7 1996/08/02 11:26:23 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: dirs.c,v 1.8 1996/09/16 16:35:09 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -153,7 +153,7 @@ extractdirs(genmode)
        int fd;
 
        vprintf(stdout, "Extract directories from tape\n");
-       (void) sprintf(dirfile, "%s/rstdir%d", _PATH_TMP, dumpdate);
+       (void) sprintf(dirfile, "%srstdir%d", _PATH_TMP, dumpdate);
        if (command != 'r' && command != 'R') {
                (void *) strcat(dirfile, "-XXXXXX");
                if (mktemp(dirfile) == NULL) {
@@ -174,7 +174,7 @@ extractdirs(genmode)
                exit(1);
        }
        if (genmode != 0) {
-               (void) sprintf(modefile, "%s/rstmode%d", _PATH_TMP, dumpdate);
+               (void) sprintf(modefile, "%srstmode%d", _PATH_TMP, dumpdate);
                if (command != 'r' && command != 'R') {
                        (void *) strcat(modefile, "-XXXXXX");
                        if (mktemp(modefile) == NULL) {
@@ -616,7 +616,7 @@ setdirmodes(flags)
        
        vprintf(stdout, "Set directory mode, owner, and times.\n");
        if (command == 'r' || command == 'R')
-               (void) sprintf(modefile, "%s/rstmode%d", _PATH_TMP, dumpdate);
+               (void) sprintf(modefile, "%srstmode%d", _PATH_TMP, dumpdate);
        if (modefile[0] == '#') {
                panic("modefile not defined\n");
                fprintf(stderr, "directory mode, owner, and times not set\n");

diff --git a/usr.bin/calendar/calendar.c b/usr.bin/calendar/calendar.c
index 98ee572..26fe652 100644 (file)
--- a/usr.bin/calendar/calendar.c
+++ b/usr.bin/calendar/calendar.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: calendar.c,v 1.2 1996/06/26 05:31:45 deraadt Exp $    */
+/*     $OpenBSD: calendar.c,v 1.3 1996/09/16 16:36:04 millert Exp $    */
 /*     $NetBSD: calendar.c,v 1.8 1995/09/02 05:38:38 jtc Exp $ */
 
 /*
@@ -44,7 +44,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)calendar.c 8.4 (Berkeley) 1/7/95";
 #endif
-static char rcsid[] = "$OpenBSD: calendar.c,v 1.2 1996/06/26 05:31:45 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: calendar.c,v 1.3 1996/09/16 16:36:04 millert Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -323,7 +323,7 @@ opencal()
                return (stdout);
 
        /* set output to a temporary file, so if no output don't send mail */
-       (void)snprintf(path, sizeof(path), "%s/_calXXXXXX", _PATH_TMP);
+       (void)snprintf(path, sizeof(path), "%s_calXXXXXX", _PATH_TMP);
        if ((fd = mkstemp(path)) < 0)
                return (NULL);
        return (fdopen(fd, "w+"));