summaryrefslogtreecommitdiff
path: root/bin/cp
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>1997-09-01 18:30:39 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>1997-09-01 18:30:39 +0000
commita43ab78081569419e6c61ef03c154da56a667dd8 (patch)
tree9d27b3251a03c6298aa14827691ac2399227b0e5 /bin/cp
parent380f0870e4aafdd13a6050959648e2e735f2ea56 (diff)
i am bored enough to fix terminal space/tab uglies
Diffstat (limited to 'bin/cp')
-rw-r--r--bin/cp/cp.c24
-rw-r--r--bin/cp/utils.c6
2 files changed, 15 insertions, 15 deletions
diff --git a/bin/cp/cp.c b/bin/cp/cp.c
index 34f0d6edbc8..dfed11e277f 100644
--- a/bin/cp/cp.c
+++ b/bin/cp/cp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cp.c,v 1.8 1997/08/23 00:01:38 millert Exp $ */
+/* $OpenBSD: cp.c,v 1.9 1997/09/01 18:29:17 deraadt 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.8 1997/08/23 00:01:38 millert Exp $";
+static char rcsid[] = "$OpenBSD: cp.c,v 1.9 1997/09/01 18:29:17 deraadt Exp $";
#endif
#endif /* not lint */
@@ -110,7 +110,7 @@ main(argc, argv)
char *p, **av;
Hflag = Lflag = Pflag = Rflag = 0;
- while ((ch = getopt(argc, argv, "HLPRfipr")) != -1)
+ while ((ch = getopt(argc, argv, "HLPRfipr")) != -1)
switch (ch) {
case 'H':
Hflag = 1;
@@ -192,7 +192,7 @@ main(argc, argv)
to.target_end = to.p_end;
/* Set end of argument list for fts(3). */
- argv[argc] = NULL;
+ argv[argc] = NULL;
/* Strip trailing slashes from source files */
for (av = argv; *av != NULL; av++) {
@@ -221,7 +221,7 @@ main(argc, argv)
if (r == -1 || !S_ISDIR(to_stat.st_mode)) {
/*
* Case (1). Target is not a directory.
- */
+ */
if (argc > 1) {
usage();
exit(1);
@@ -238,7 +238,7 @@ main(argc, argv)
stat(*argv, &tmp_stat);
else
lstat(*argv, &tmp_stat);
-
+
if (S_ISDIR(tmp_stat.st_mode) && (Rflag || rflag))
type = DIR_TO_DNE;
else
@@ -313,10 +313,10 @@ copy(argv, type, fts_options)
if (curr->fts_level == FTS_ROOTLEVEL)
if (type != DIR_TO_DNE) {
p = strrchr(curr->fts_path, '/');
- base = (p == NULL) ? 0 :
+ base = (p == NULL) ? 0 :
(int)(p - curr->fts_path + 1);
- if (!strcmp(&curr->fts_path[base],
+ if (!strcmp(&curr->fts_path[base],
".."))
base += 1;
} else
@@ -329,7 +329,7 @@ copy(argv, type, fts_options)
*target_mid++ = '/';
*target_mid = '\0';
if (target_mid - to.p_path + nlen >= MAXPATHLEN) {
- warnx("%s%s: name too long (not copied)",
+ warnx("%s%s: name too long (not copied)",
to.p_path, p);
rval = 1;
continue;
@@ -385,7 +385,7 @@ copy(argv, type, fts_options)
* umask blocks owner writes, we fail..
*/
if (dne) {
- if (mkdir(to.p_path,
+ if (mkdir(to.p_path,
curr->fts_statp->st_mode | S_IRWXU) < 0)
err(1, "%s", to.p_path);
} else if (!S_ISDIR(to_stat.st_mode)) {
@@ -401,7 +401,7 @@ copy(argv, type, fts_options)
if (pflag && setfile(curr->fts_statp, 0))
rval = 1;
else if (dne)
- (void)chmod(to.p_path,
+ (void)chmod(to.p_path,
curr->fts_statp->st_mode);
break;
case S_IFBLK:
@@ -417,7 +417,7 @@ copy(argv, type, fts_options)
if (Rflag) {
if (copy_fifo(curr->fts_statp, !dne))
rval = 1;
- } else
+ } else
if (copy_file(curr, dne))
rval = 1;
break;
diff --git a/bin/cp/utils.c b/bin/cp/utils.c
index 33b31ed8d30..7c1c8e84ffd 100644
--- a/bin/cp/utils.c
+++ b/bin/cp/utils.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: utils.c,v 1.8 1997/07/31 17:00:58 kstailey Exp $ */
+/* $OpenBSD: utils.c,v 1.9 1997/09/01 18:29:19 deraadt Exp $ */
/* $NetBSD: utils.c,v 1.6 1997/02/26 14:40:51 cgd Exp $ */
/*-
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)utils.c 8.3 (Berkeley) 4/1/94";
#else
-static char rcsid[] = "$OpenBSD: utils.c,v 1.8 1997/07/31 17:00:58 kstailey Exp $";
+static char rcsid[] = "$OpenBSD: utils.c,v 1.9 1997/09/01 18:29:19 deraadt Exp $";
#endif
#endif /* not lint */
@@ -69,7 +69,7 @@ copy_file(entp, dne)
#ifdef VM_AND_BUFFER_CACHE_SYNCHRONIZED
char *p;
#endif
-
+
if ((from_fd = open(entp->fts_path, O_RDONLY, 0)) == -1) {
warn("%s", entp->fts_path);
return (1);