diff options
| author |   millert <millert@openbsd.org> | 2003-07-21 22:57:16 +0000 |
|---|---|---|
| committer | millert <millert@openbsd.org> | 2003-07-21 22:57:16 +0000 |
| commit | de41415836bb14cf4a42db4b24855c7542937ddb (patch) | |
| tree | ce9f94e5bf2df5bf82257d50ae81f592fcea92ef /usr.bin/diff/diff.c | |
| parent | enforce restrictions on prot and flags to mprotect and mmap. invalid or (diff) | |
| download | wireguard-openbsd-de41415836bb14cf4a42db4b24855c7542937ddb.tar.xz wireguard-openbsd-de41415836bb14cf4a42db4b24855c7542937ddb.zip | |
Fix printing of status when not in -l mode which was broken when the
-l support was added.
Diffstat (limited to 'usr.bin/diff/diff.c')
| -rw-r--r-- | usr.bin/diff/diff.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/diff/diff.c b/usr.bin/diff/diff.c index 91e81bb4a9a..149259e178a 100644 --- a/usr.bin/diff/diff.c +++ b/usr.bin/diff/diff.c @@ -1,4 +1,4 @@ -/* $OpenBSD: diff.c,v 1.30 2003/07/21 21:59:58 henning Exp $ */ +/* $OpenBSD: diff.c,v 1.31 2003/07/21 22:57:16 millert Exp $ */ /* * Copyright (c) 2003 Todd C. Miller <Todd.Miller@courtesan.com> @@ -21,7 +21,7 @@ */ #ifndef lint -static const char rcsid[] = "$OpenBSD: diff.c,v 1.30 2003/07/21 21:59:58 henning Exp $"; +static const char rcsid[] = "$OpenBSD: diff.c,v 1.31 2003/07/21 22:57:16 millert Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -335,11 +335,11 @@ print_status(int val, char *path1, char *path2, char *entry) path2, entry ? entry : ""); break; case D_MISMATCH1: - printf("File %s/%s is a directory while file %s/%s is a file\n", + printf("File %s%s is a directory while file %s%s is a regular file\n", path1, entry ? entry : "", path2, entry ? entry : ""); break; case D_MISMATCH2: - printf("File %s/%s is a file while file %s/%s is a directory\n", + printf("File %s%s is a regular file while file %s%s is a directory\n", path1, entry ? entry : "", path2, entry ? entry : ""); break; } |