pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/devel/nbpatch Import the BSD version of patch ass foun...
details: https://anonhg.NetBSD.org/pkgsrc/rev/ff91848f4d1d
branches: trunk
changeset: 546954:ff91848f4d1d
user: joerg <joerg%pkgsrc.org@localhost>
date: Wed Sep 10 11:03:21 2008 +0000
description:
Import the BSD version of patch ass found in DragonFly and based on the
OpenBSD changes as nbpatch-20080910.
This package is intended to replace devel/patch as dependency for the
infrastructure. GNU patch has issues both with very long lines and with
asymmetric context, making it impossible to use in some situations.
diffstat:
devel/nbpatch/DESCR | 7 +
devel/nbpatch/Makefile | 26 +
devel/nbpatch/PLIST | 4 +
devel/nbpatch/files/Makefile | 6 +
devel/nbpatch/files/backupfile.c | 256 ++++++
devel/nbpatch/files/backupfile.h | 42 +
devel/nbpatch/files/common.h | 124 +++
devel/nbpatch/files/inp.c | 490 +++++++++++
devel/nbpatch/files/inp.h | 35 +
devel/nbpatch/files/mkpath.c | 88 ++
devel/nbpatch/files/nbpatch.1 | 700 +++++++++++++++++
devel/nbpatch/files/patch.c | 1066 ++++++++++++++++++++++++++
devel/nbpatch/files/pathnames.h | 14 +
devel/nbpatch/files/pch.c | 1557 ++++++++++++++++++++++++++++++++++++++
devel/nbpatch/files/pch.h | 59 +
devel/nbpatch/files/util.c | 438 ++++++++++
devel/nbpatch/files/util.h | 54 +
17 files changed, 4966 insertions(+), 0 deletions(-)
diffs (truncated from 5034 to 300 lines):
diff -r 5d1eddaad2fd -r ff91848f4d1d devel/nbpatch/DESCR
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/nbpatch/DESCR Wed Sep 10 11:03:21 2008 +0000
@@ -0,0 +1,7 @@
+'patch' takes a patch file containing a difference listing
+produced by diff and applies those differences to one or
+more original files, producing patched versions.
+
+This is the BSD licensed version derived from Larry Wall's original
+version. It differs from the GPL version in less hard-coded limits
+and more intelligent reject files.
diff -r 5d1eddaad2fd -r ff91848f4d1d devel/nbpatch/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/nbpatch/Makefile Wed Sep 10 11:03:21 2008 +0000
@@ -0,0 +1,26 @@
+# $NetBSD: Makefile,v 1.1.1.1 2008/09/10 11:03:21 joerg Exp $
+#
+
+DISTNAME= nbpatch-20080910
+CATEGORIES= devel
+MASTER_SITES= # empty
+DISTFILES= # empty
+
+MAINTAINER= joerg%NetBSD.org@localhost
+HOMEPAGE= http://www.pkgsrc.org/
+COMMENT= Patch files using diff output
+
+PKG_DESTDIR_SUPPORT= user-destdir
+
+# Allow checkperms and othher core dependencies to use patches
+CHECK_PERMS= no
+
+USE_BSD_MAKEFILE= yes
+USE_FEATURES= nbcompat
+
+INSTALLATION_DIRS= bin ${PKGMANDIR}/cat1 ${PKGMANDIR}/man1
+
+do-extract:
+ ${CP} -r ${FILESDIR} ${WRKSRC}
+
+.include "../../mk/bsd.pkg.mk"
diff -r 5d1eddaad2fd -r ff91848f4d1d devel/nbpatch/PLIST
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/nbpatch/PLIST Wed Sep 10 11:03:21 2008 +0000
@@ -0,0 +1,4 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2008/09/10 11:03:21 joerg Exp $
+bin/nbpatch
+man/cat1/nbpatch.0
+man/man1/nbpatch.1
diff -r 5d1eddaad2fd -r ff91848f4d1d devel/nbpatch/files/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/nbpatch/files/Makefile Wed Sep 10 11:03:21 2008 +0000
@@ -0,0 +1,6 @@
+# $NetBSD: Makefile,v 1.1.1.1 2008/09/10 11:03:21 joerg Exp $
+
+PROG= nbpatch
+SRCS= patch.c pch.c inp.c util.c backupfile.c mkpath.c
+
+.include <bsd.prog.mk>
diff -r 5d1eddaad2fd -r ff91848f4d1d devel/nbpatch/files/backupfile.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/nbpatch/files/backupfile.c Wed Sep 10 11:03:21 2008 +0000
@@ -0,0 +1,256 @@
+/*
+ * $OpenBSD: backupfile.c,v 1.19 2006/03/11 19:41:30 otto Exp $
+ * $DragonFly: src/usr.bin/patch/backupfile.c,v 1.5 2008/08/11 00:05:06 joerg Exp $
+ * $NetBSD: backupfile.c,v 1.1.1.1 2008/09/10 11:03:21 joerg Exp $
+ */
+
+/*
+ * backupfile.c -- make Emacs style backup file names
+ *
+ * Copyright (C) 1990 Free Software Foundation, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * without restriction.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+/*
+ * David MacKenzie <djm%ai.mit.edu@localhost>. Some algorithms adapted from GNU Emacs.
+ */
+
+#if HAVE_CONFIG_H
+#include "config.h"
+#endif
+#include <nbcompat.h>
+
+#include <ctype.h>
+#include <dirent.h>
+#include <libgen.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "backupfile.h"
+
+
+#define ISDIGIT(c) (isascii ((unsigned char)c) && isdigit ((unsigned char)c))
+
+/* Which type of backup file names are generated. */
+enum backup_type backup_type = none;
+
+/*
+ * The extension added to file names to produce a simple (as opposed to
+ * numbered) backup file name.
+ */
+const char *simple_backup_suffix = "~";
+
+static char *concat(const char *, const char *);
+static char *make_version_name(const char *, int);
+static int max_backup_version(const char *, const char *);
+static int version_number(const char *, const char *, size_t);
+static int argmatch(const char *, const char **);
+static void invalid_arg(const char *, const char *, int);
+
+/*
+ * Return the name of the new backup file for file FILE, allocated with
+ * malloc. Return 0 if out of memory. FILE must not end with a '/' unless it
+ * is the root directory. Do not call this function if backup_type == none.
+ */
+char *
+find_backup_file_name(const char *file)
+{
+ char *dir, *base_versions, *tmp_file;
+ int highest_backup;
+
+ if (backup_type == simple)
+ return concat(file, simple_backup_suffix);
+ tmp_file = strdup(file);
+ if (tmp_file == NULL)
+ return NULL;
+ base_versions = concat(basename(tmp_file), ".~");
+ free(tmp_file);
+ if (base_versions == NULL)
+ return NULL;
+ tmp_file = strdup(file);
+ if (tmp_file == NULL) {
+ free(base_versions);
+ return NULL;
+ }
+ dir = dirname(tmp_file);
+ if (dir == NULL) {
+ free(base_versions);
+ free(tmp_file);
+ return NULL;
+ }
+ highest_backup = max_backup_version(base_versions, dir);
+ free(base_versions);
+ free(tmp_file);
+ if (backup_type == numbered_existing && highest_backup == 0)
+ return concat(file, simple_backup_suffix);
+ return make_version_name(file, highest_backup + 1);
+}
+
+/*
+ * Return the number of the highest-numbered backup file for file FILE in
+ * directory DIR. If there are no numbered backups of FILE in DIR, or an
+ * error occurs reading DIR, return 0. FILE should already have ".~" appended
+ * to it.
+ */
+static int
+max_backup_version(const char *file, const char *dir)
+{
+ DIR *dirp;
+ struct dirent *dp;
+ int highest_version, this_version;
+ size_t file_name_length;
+
+ dirp = opendir(dir);
+ if (dirp == NULL)
+ return 0;
+
+ highest_version = 0;
+ file_name_length = strlen(file);
+
+ while ((dp = readdir(dirp)) != NULL) {
+ if (dp->d_namlen <= file_name_length)
+ continue;
+
+ this_version = version_number(file, dp->d_name, file_name_length);
+ if (this_version > highest_version)
+ highest_version = this_version;
+ }
+ closedir(dirp);
+ return highest_version;
+}
+
+/*
+ * Return a string, allocated with malloc, containing "FILE.~VERSION~".
+ * Return 0 if out of memory.
+ */
+static char *
+make_version_name(const char *file, int version)
+{
+ char *backup_name;
+
+ if (asprintf(&backup_name, "%s.~%d~", file, version) == -1)
+ return NULL;
+ return backup_name;
+}
+
+/*
+ * If BACKUP is a numbered backup of BASE, return its version number;
+ * otherwise return 0. BASE_LENGTH is the length of BASE. BASE should
+ * already have ".~" appended to it.
+ */
+static int
+version_number(const char *base, const char *backup, size_t base_length)
+{
+ int version;
+ const char *p;
+
+ version = 0;
+ if (!strncmp(base, backup, base_length) && ISDIGIT(backup[base_length])) {
+ for (p = &backup[base_length]; ISDIGIT(*p); ++p)
+ version = version * 10 + *p - '0';
+ if (p[0] != '~' || p[1])
+ version = 0;
+ }
+ return version;
+}
+
+/*
+ * Return the newly-allocated concatenation of STR1 and STR2. If out of
+ * memory, return 0.
+ */
+static char *
+concat(const char *str1, const char *str2)
+{
+ char *newstr;
+
+ if (asprintf(&newstr, "%s%s", str1, str2) == -1)
+ return NULL;
+ return newstr;
+}
+
+/*
+ * If ARG is an unambiguous match for an element of the null-terminated array
+ * OPTLIST, return the index in OPTLIST of the matched element, else -1 if it
+ * does not match any element or -2 if it is ambiguous (is a prefix of more
+ * than one element).
+ */
+static int
+argmatch(const char *arg, const char **optlist)
+{
+ int i; /* Temporary index in OPTLIST. */
+ size_t arglen; /* Length of ARG. */
+ int matchind = -1; /* Index of first nonexact match. */
+ int ambiguous = 0; /* If nonzero, multiple nonexact match(es). */
+
+ arglen = strlen(arg);
+
+ /* Test all elements for either exact match or abbreviated matches. */
+ for (i = 0; optlist[i]; i++) {
+ if (!strncmp(optlist[i], arg, arglen)) {
+ if (strlen(optlist[i]) == arglen)
+ /* Exact match found. */
+ return i;
+ else if (matchind == -1)
+ /* First nonexact match found. */
+ matchind = i;
+ else
+ /* Second nonexact match found. */
+ ambiguous = 1;
+ }
+ }
+ if (ambiguous)
+ return -2;
+ else
+ return matchind;
+}
+
+/*
+ * Error reporting for argmatch. KIND is a description of the type of entity
+ * that was being matched. VALUE is the invalid value that was given. PROBLEM
+ * is the return value from argmatch.
+ */
+static void
+invalid_arg(const char *kind, const char *value, int problem)
+{
+ fprintf(stderr, "patch: ");
+ if (problem == -1)
+ fprintf(stderr, "invalid");
+ else /* Assume -2. */
+ fprintf(stderr, "ambiguous");
+ fprintf(stderr, " %s `%s'\n", kind, value);
+}
+
+static const char *backup_args[] = {
+ "never", "simple", "nil", "existing", "t", "numbered", 0
+};
+
+static enum backup_type backup_types[] = {
+ simple, simple, numbered_existing,
+ numbered_existing, numbered, numbered
Home |
Main Index |
Thread Index |
Old Index