summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>1997-03-14 05:40:21 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>1997-03-14 05:40:21 +0000
commitc6d2f9b120f174d89d9ef92b8883aa181b984fef (patch)
tree17a2b4785aac86f5bf7314dd597e9b144560f0bf
parentbcdacc5cf12b19103797e3d64b0e990f969b9688 (diff)
Correct usage of S_IFREG.
-rw-r--r--usr.bin/ftp/ftp.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/ftp/ftp.c b/usr.bin/ftp/ftp.c
index d75b6b7396d..e0841179492 100644
--- a/usr.bin/ftp/ftp.c
+++ b/usr.bin/ftp/ftp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ftp.c,v 1.13 1997/03/14 04:32:16 millert Exp $ */
+/* $OpenBSD: ftp.c,v 1.14 1997/03/14 05:40:20 millert Exp $ */
/* $NetBSD: ftp.c,v 1.23 1997/03/13 06:23:17 lukem Exp $ */
/*
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)ftp.c 8.6 (Berkeley) 10/27/94";
#else
-static char rcsid[] = "$OpenBSD: ftp.c,v 1.13 1997/03/14 04:32:16 millert Exp $";
+static char rcsid[] = "$OpenBSD: ftp.c,v 1.14 1997/03/14 05:40:20 millert Exp $";
#endif
#endif /* not lint */
@@ -588,7 +588,7 @@ sendrequest(cmd, local, remote, printnames)
}
closefunc = fclose;
if (fstat(fileno(fin), &st) < 0 ||
- (st.st_mode&S_IFMT) != S_IFREG) {
+ (st.st_mode & S_IFMT) != S_IFREG) {
printf("%s: not a plain file.\n", local);
(void)signal(SIGINT, oldintr);
(void)signal(SIGINFO, oldinti);
@@ -962,7 +962,7 @@ recvrequest(cmd, local, remote, lmode, printnames)
}
bufsize = st.st_blksize;
}
- if (!(st.st_mode & S_IFREG)) {
+ if ((st.st_mode & S_IFMT) != S_IFREG) {
progress = 0;
preserve = 0;
}