diff options
Diffstat (limited to 'usr.bin/patch')
| -rw-r--r-- | usr.bin/patch/common.h | 6 | ||||
| -rw-r--r-- | usr.bin/patch/inp.c | 9 | ||||
| -rw-r--r-- | usr.bin/patch/patch.1 | 8 | ||||
| -rw-r--r-- | usr.bin/patch/pch.c | 4 | ||||
| -rw-r--r-- | usr.bin/patch/util.c | 8 |
5 files changed, 12 insertions, 23 deletions
diff --git a/usr.bin/patch/common.h b/usr.bin/patch/common.h index 57b6614d7d0..51649b1aad8 100644 --- a/usr.bin/patch/common.h +++ b/usr.bin/patch/common.h @@ -1,4 +1,4 @@ -/* $OpenBSD: common.h,v 1.26 2006/03/11 19:41:30 otto Exp $ */ +/* $OpenBSD: common.h,v 1.27 2014/11/22 15:49:28 tobias Exp $ */ /* * patch - a program to apply diffs to original files @@ -39,10 +39,6 @@ #define MAXLINELEN 8192 #define BUFFERSIZE 1024 -#define SCCSPREFIX "s." -#define GET "get -e %s" -#define SCCSDIFF "get -p %s | diff - %s >/dev/null" - #define RCSSUFFIX ",v" #define CHECKOUT "co -l %s" #define RCSDIFF "rcsdiff %s > /dev/null" diff --git a/usr.bin/patch/inp.c b/usr.bin/patch/inp.c index f00da1ea1ab..eddf723474d 100644 --- a/usr.bin/patch/inp.c +++ b/usr.bin/patch/inp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: inp.c,v 1.39 2014/11/15 16:35:47 tobias Exp $ */ +/* $OpenBSD: inp.c,v 1.40 2014/11/22 15:49:28 tobias Exp $ */ /* * patch - a program to apply diffs to original files @@ -163,7 +163,7 @@ plan_a(const char *filename) } if (statfailed && check_only) fatal("%s not found, -C mode, can't probe further\n", filename); - /* For nonexistent or read-only files, look for RCS or SCCS versions. */ + /* For nonexistent or read-only files, look for RCS versions. */ if (statfailed || /* No one can write to it. */ (filestat.st_mode & 0222) == 0 || @@ -187,11 +187,6 @@ plan_a(const char *filename) snprintf(buf, sizeof buf, CHECKOUT, filename); snprintf(lbuf, sizeof lbuf, RCSDIFF, filename); cs = "RCS"; - } else if (try("%s/SCCS/%s%s", filedir, SCCSPREFIX, filebase) || - try("%s/%s%s", filedir, SCCSPREFIX, filebase)) { - snprintf(buf, sizeof buf, GET, s); - snprintf(lbuf, sizeof lbuf, SCCSDIFF, s, filename); - cs = "SCCS"; } else if (statfailed) fatal("can't find %s\n", filename); /* diff --git a/usr.bin/patch/patch.1 b/usr.bin/patch/patch.1 index 14cf67af60c..cf93a31daa4 100644 --- a/usr.bin/patch/patch.1 +++ b/usr.bin/patch/patch.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: patch.1,v 1.27 2014/04/15 06:26:54 jmc Exp $ +.\" $OpenBSD: patch.1,v 1.28 2014/11/22 15:49:28 tobias Exp $ .\" Copyright 1986, Larry Wall .\" .\" Redistribution and use in source and binary forms, with or without @@ -19,7 +19,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd $Mdocdate: April 15 2014 $ +.Dd $Mdocdate: November 22 2014 $ .Dt PATCH 1 .Os .Sh NAME @@ -481,8 +481,8 @@ the shortest basename, and the shortest total file name length (in that order). .It If no file exists, .Nm -checks for the existence of the files in an SCCS or RCS directory -(using the appropriate prefix or suffix) using the criteria specified +checks for the existence of the files in an RCS directory +(using the appropriate suffix) using the criteria specified above. If found, .Nm diff --git a/usr.bin/patch/pch.c b/usr.bin/patch/pch.c index 163446ef2e6..f35a6cfea0c 100644 --- a/usr.bin/patch/pch.c +++ b/usr.bin/patch/pch.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pch.c,v 1.43 2014/11/18 17:03:35 tobias Exp $ */ +/* $OpenBSD: pch.c,v 1.44 2014/11/22 15:49:28 tobias Exp $ */ /* * patch - a program to apply diffs to original files @@ -1451,7 +1451,7 @@ posix_name(const struct file_name *names, bool assume_exists) if (path == NULL && !assume_exists) { /* * No files found, look for something we can checkout from - * RCS/SCCS dirs. Same order as above. + * RCS dirs. Same order as above. */ for (i = 0; i < MAX_FILE; i++) { if (names[i].path != NULL && diff --git a/usr.bin/patch/util.c b/usr.bin/patch/util.c index 40414a75c4c..876eda36e42 100644 --- a/usr.bin/patch/util.c +++ b/usr.bin/patch/util.c @@ -1,4 +1,4 @@ -/* $OpenBSD: util.c,v 1.36 2013/11/26 13:19:07 deraadt Exp $ */ +/* $OpenBSD: util.c,v 1.37 2014/11/22 15:49:28 tobias Exp $ */ /* * patch - a program to apply diffs to original files @@ -374,7 +374,7 @@ fetchname(const char *at, bool *exists, int strip_leading) } /* - * Takes the name returned by fetchname and looks in RCS/SCCS directories + * Takes the name returned by fetchname and looks in RCS directory * for a checked in version. */ char * @@ -391,9 +391,7 @@ checked_in(char *file) if (try("%s/RCS/%s%s", filedir, filebase, RCSSUFFIX) || try("%s/RCS/%s%s", filedir, filebase, "") || - try("%s/%s%s", filedir, filebase, RCSSUFFIX) || - try("%s/SCCS/%s%s", filedir, SCCSPREFIX, filebase) || - try("%s/%s%s", filedir, SCCSPREFIX, filebase)) + try("%s/%s%s", filedir, filebase, RCSSUFFIX)) return file; return NULL; |