about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2009-03-03 20:44:34 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2009-03-03 20:44:34 +0000
commit8fce24dc4fc05425b58a913aad20d2356d79322a (patch)
treeaa093f3aa65041491cd5b1ff61790e7cf457d651
parent93dd3e0540408c5432cee323da07985859ea9638 (diff)
downloadzsh-8fce24dc4fc05425b58a913aad20d2356d79322a.tar.gz
zsh-8fce24dc4fc05425b58a913aad20d2356d79322a.tar.xz
zsh-8fce24dc4fc05425b58a913aad20d2356d79322a.zip
fix the cap.c patch
-rw-r--r--ChangeLog7
-rw-r--r--Src/Modules/cap.c3
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 62615a594..7036e8eab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-03-03  Peter Stephenson  <p.w.stephenson@ntlworld.com>
+
+	* unposted: Src/Modules/cap.c: that's what happens when you
+	make patches for things that aren't supported on your system.
+
 2009-03-03  Peter Stephenson  <pws@csr.com>
 
 	* 26680: Src/Modules/cap.c: missed some stuff that needed metafied
@@ -11320,5 +11325,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.4597 $                         
+* $Revision: 1.4598 $                         
 *****************************************************
diff --git a/Src/Modules/cap.c b/Src/Modules/cap.c
index aaf5e2433..0b7752027 100644
--- a/Src/Modules/cap.c
+++ b/Src/Modules/cap.c
@@ -73,7 +73,6 @@ bin_getcap(char *nam, char **argv, UNUSED(Options ops), UNUSED(int func))
 	char *result = NULL;
 	ssize_t length;
 	cap_t caps;
-	char *filename;
 
 	caps = cap_get_file(unmetafy(dupstring(*argv), NULL));
 	if(caps)
@@ -102,7 +101,7 @@ bin_setcap(char *nam, char **argv, UNUSED(Options ops), UNUSED(int func))
     }
 
     do {
-	if(cap_set_file(unmetafy(dupstring(*argv, NULL)), caps)) {
+	if(cap_set_file(unmetafy(dupstring(*argv), NULL), caps)) {
 	    zwarnnam(nam, "%s: %e", *argv, errno);
 	    ret = 1;
 	}