diff options
author | grant <grant> | 2003-06-23 13:45:07 +0000 |
---|---|---|
committer | grant <grant> | 2003-06-23 13:45:07 +0000 |
commit | 4ebf26aa9745e5ea676c9bdbd9abb32ed94b0ba0 (patch) | |
tree | ac787a1b1f17343d820d27af01fb09c8caaf3710 /archivers | |
parent | 39f66e437d0c524ffda8e68a7079fc18c4ccab73 (diff) | |
download | pkgsrc-4ebf26aa9745e5ea676c9bdbd9abb32ed94b0ba0.tar.gz |
oops, missed from last update.
sync with -current:
ar_subs.c 1.25
pax.c 1.27
tar.c 1.40
Diffstat (limited to 'archivers')
-rw-r--r-- | archivers/pax/files/ar_subs.c | 6 | ||||
-rw-r--r-- | archivers/pax/files/pax.c | 6 | ||||
-rw-r--r-- | archivers/pax/files/tar.c | 8 |
3 files changed, 10 insertions, 10 deletions
diff --git a/archivers/pax/files/ar_subs.c b/archivers/pax/files/ar_subs.c index ed18df12b1e..3de91d01804 100644 --- a/archivers/pax/files/ar_subs.c +++ b/archivers/pax/files/ar_subs.c @@ -1,4 +1,4 @@ -/* $NetBSD: ar_subs.c,v 1.1.1.1 2003/06/23 11:46:12 grant Exp $ */ +/* $NetBSD: ar_subs.c,v 1.2 2003/06/23 13:45:07 grant Exp $ */ /*- * Copyright (c) 1992 Keith Muller. @@ -47,7 +47,7 @@ #if 0 static char sccsid[] = "@(#)ar_subs.c 8.2 (Berkeley) 4/18/94"; #else -__RCSID("$NetBSD: ar_subs.c,v 1.1.1.1 2003/06/23 11:46:12 grant Exp $"); +__RCSID("$NetBSD: ar_subs.c,v 1.2 2003/06/23 13:45:07 grant Exp $"); #endif #endif /* not lint */ @@ -342,7 +342,7 @@ extract(void) continue; } /* - * we have a file with data here. If we can not create it, skip + * we have a file with data here. If we cannot create it, skip * over the data and purge the name from hard link table */ if ((fd = file_creat(arcn)) < 0) { diff --git a/archivers/pax/files/pax.c b/archivers/pax/files/pax.c index 4879aac8220..d320d3cc035 100644 --- a/archivers/pax/files/pax.c +++ b/archivers/pax/files/pax.c @@ -1,4 +1,4 @@ -/* $NetBSD: pax.c,v 1.1.1.1 2003/06/23 11:46:32 grant Exp $ */ +/* $NetBSD: pax.c,v 1.2 2003/06/23 13:45:07 grant Exp $ */ /*- * Copyright (c) 1992 Keith Muller. @@ -52,7 +52,7 @@ __COPYRIGHT("@(#) Copyright (c) 1992, 1993\n\ #if 0 static char sccsid[] = "@(#)pax.c 8.2 (Berkeley) 4/18/94"; #else -__RCSID("$NetBSD: pax.c,v 1.1.1.1 2003/06/23 11:46:32 grant Exp $"); +__RCSID("$NetBSD: pax.c,v 1.2 2003/06/23 13:45:07 grant Exp $"); #endif #endif /* not lint */ @@ -306,7 +306,7 @@ main(int argc, char **argv) break; case APPND: if (gzip_program != NULL) - err(1, "can not gzip while appending"); + err(1, "cannot gzip while appending"); append(); /* * Check if we tried to append on an empty file and diff --git a/archivers/pax/files/tar.c b/archivers/pax/files/tar.c index 0dc5422a761..e9029cf8987 100644 --- a/archivers/pax/files/tar.c +++ b/archivers/pax/files/tar.c @@ -1,4 +1,4 @@ -/* $NetBSD: tar.c,v 1.1.1.1 2003/06/23 11:46:41 grant Exp $ */ +/* $NetBSD: tar.c,v 1.2 2003/06/23 13:45:07 grant Exp $ */ /*- * Copyright (c) 1992 Keith Muller. @@ -47,7 +47,7 @@ #if 0 static char sccsid[] = "@(#)tar.c 8.2 (Berkeley) 4/18/94"; #else -__RCSID("$NetBSD: tar.c,v 1.1.1.1 2003/06/23 11:46:41 grant Exp $"); +__RCSID("$NetBSD: tar.c,v 1.2 2003/06/23 13:45:07 grant Exp $"); #endif #endif /* not lint */ @@ -1243,7 +1243,7 @@ name_split(char *name, int len) len = start - name; /* - * NOTE: /str where the length of str == TNMSZ can not be stored under + * NOTE: /str where the length of str == TNMSZ cannot be stored under * the p1003.1-1990 spec for ustar. We could force a prefix of / and * the file would then expand on extract to //str. The len == 0 below * makes this special case follow the spec to the letter. @@ -1319,7 +1319,7 @@ tar_gnutar_X_compat(path) fp = fopen(path, "r"); if (fp == NULL) { - tty_warn(1, "can not open %s: %s", path, + tty_warn(1, "cannot open %s: %s", path, strerror(errno)); return(-1); } |