summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Gruenbacher <agruen@suse.de>2010-05-04 18:33:06 +0200
committerAndreas Gruenbacher <agruen@suse.de>2010-05-04 18:37:06 +0200
commit4ded52f91253482ab4ce29a538aa7a33f3aab596 (patch)
tree308925458030e4b984c6232fda80d605c9af5009
parentbcf08ba04238ee7054e3f5d36066631459e2e0bc (diff)
downloadpatch-4ded52f91253482ab4ce29a538aa7a33f3aab596.tar.gz
Additional minor fixes based on Eric Blake's suggestions
* src/version.c: Put the Free Software Foundation copyright first. * tests/read-only-files: Skip when run as superuser: even files without write permissions would be writable.
-rw-r--r--ChangeLog4
-rw-r--r--src/version.c4
-rw-r--r--tests/read-only-files5
3 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index e6a8fd3..c98e995 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,10 @@
2009-05-04 Andreas Gruenbacher <agruen@suse.de>
+ * src/version.c: Put the Free Software Foundation copyright first.
+ * tests/read-only-files: Skip when run as superuser: even files
+ without write permissions would be writable.
+
* src/util.c (create_backup): Document patch's backup file logic.
(create_backup, create_backup_copy): Add a flag to remember the backup
file; use when a patch deletes a file.
diff --git a/src/version.c b/src/version.c
index d9e894a..2a00bf6 100644
--- a/src/version.c
+++ b/src/version.c
@@ -7,8 +7,8 @@
#include <version.h>
static char const copyright_string[] = "\
-Copyright (C) 1988 Larry Wall\n\
-Copyright (C) 2003, 2009, 2010 Free Software Foundation, Inc.";
+Copyright (C) 2003, 2009, 2010 Free Software Foundation, Inc.\n\
+Copyright (C) 1988 Larry Wall";
static char const free_software_msgid[] = "\
License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>.\n\
diff --git a/tests/read-only-files b/tests/read-only-files
index 816baab..df4f7f0 100644
--- a/tests/read-only-files
+++ b/tests/read-only-files
@@ -12,6 +12,11 @@ require_cat
use_local_patch
use_tmpdir
+if test `id -u` = 0; then
+ echo "This test must not be run as superuser" >&2
+ exit 77
+fi
+
# ==============================================================
cat > f.diff <<EOF