summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorkstailey <kstailey@cvs.openbsd.org>1997-07-23 14:33:07 +0000
committerkstailey <kstailey@cvs.openbsd.org>1997-07-23 14:33:07 +0000
commit9e5f93caa6f3ca5383daa2254d9da72e9654eb4e (patch)
tree8222f27e82d8aff72febd7e52c1c7ca5468d2d8a /bin
parentdc827378e8e2aaf3813b5a7cd4b487194c224ebd (diff)
tabify
Diffstat (limited to 'bin')
-rw-r--r--bin/cp/cp.c20
-rw-r--r--bin/cp/extern.h4
2 files changed, 12 insertions, 12 deletions
diff --git a/bin/cp/cp.c b/bin/cp/cp.c
index a3d98a481e4..d5ed6cd6f53 100644
--- a/bin/cp/cp.c
+++ b/bin/cp/cp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cp.c,v 1.6 1997/01/15 23:40:20 millert Exp $ */
+/* $OpenBSD: cp.c,v 1.7 1997/07/23 14:32:37 kstailey Exp $ */
/* $NetBSD: cp.c,v 1.14 1995/09/07 06:14:51 jtc Exp $ */
/*
@@ -47,7 +47,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)cp.c 8.5 (Berkeley) 4/29/95";
#else
-static char rcsid[] = "$OpenBSD: cp.c,v 1.6 1997/01/15 23:40:20 millert Exp $";
+static char rcsid[] = "$OpenBSD: cp.c,v 1.7 1997/07/23 14:32:37 kstailey Exp $";
#endif
#endif /* not lint */
@@ -84,8 +84,8 @@ static char rcsid[] = "$OpenBSD: cp.c,v 1.6 1997/01/15 23:40:20 millert Exp $";
#include "extern.h"
#define STRIP_TRAILING_SLASH(p) { \
- while ((p).p_end > (p).p_path + 1 && (p).p_end[-1] == '/') \
- *--(p).p_end = 0; \
+ while ((p).p_end > (p).p_path + 1 && (p).p_end[-1] == '/') \
+ *--(p).p_end = 0; \
}
PATH_T to = { to.p_path, "" };
@@ -184,11 +184,11 @@ main(argc, argv)
errx(1, "%s: name too long", target);
(void)strcpy(to.p_path, target);
to.p_end = to.p_path + strlen(to.p_path);
- if (to.p_path == to.p_end) {
+ if (to.p_path == to.p_end) {
*to.p_end++ = '.';
*to.p_end = 0;
}
- STRIP_TRAILING_SLASH(to);
+ STRIP_TRAILING_SLASH(to);
to.target_end = to.p_end;
/* Set end of argument list for fts(3). */
@@ -281,8 +281,8 @@ copy(argv, type, fts_options)
/*
* If we are in case (2) or (3) above, we need to append the
- * source name to the target name.
- */
+ * source name to the target name.
+ */
if (type != FILE_TO_FILE) {
/*
* Need to remember the roots of traversals to create
@@ -388,8 +388,8 @@ copy(argv, type, fts_options)
/*
* If not -p and directory didn't exist, set it to be
* the same as the from directory, umodified by the
- * umask; arguably wrong, but it's been that way
- * forever.
+ * umask; arguably wrong, but it's been that way
+ * forever.
*/
if (pflag && setfile(curr->fts_statp, 0))
rval = 1;
diff --git a/bin/cp/extern.h b/bin/cp/extern.h
index 6d20efd07b2..860330977c3 100644
--- a/bin/cp/extern.h
+++ b/bin/cp/extern.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: extern.h,v 1.3 1997/02/25 02:27:28 millert Exp $ */
+/* $OpenBSD: extern.h,v 1.4 1997/07/23 14:33:06 kstailey Exp $ */
/* $NetBSD: extern.h,v 1.3 1995/03/21 09:02:16 cgd Exp $ */
/*-
@@ -38,7 +38,7 @@
typedef struct {
char *p_end; /* pointer to NULL at end of path */
- char *target_end; /* pointer to end of target base */
+ char *target_end; /* pointer to end of target base */
char p_path[MAXPATHLEN + 1]; /* pointer to the start of a path */
} PATH_T;