[24056] in Source-Commits
/svn/athena r23660 - in trunk/athena/bin/delete: . debian
daemon@ATHENA.MIT.EDU (Evan Broder)
Sun Mar 29 15:55:57 2009
Date: Sun, 29 Mar 2009 15:55:42 -0400
From: Evan Broder <broder@MIT.EDU>
Message-Id: <200903291955.n2TJtgwB009186@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: broder
Date: 2009-03-29 15:55:42 -0400 (Sun, 29 Mar 2009)
New Revision: 23660
Modified:
trunk/athena/bin/delete/debian/changelog
trunk/athena/bin/delete/delete_errs.et
trunk/athena/bin/delete/expunge.c
trunk/athena/bin/delete/lsdel.c
trunk/athena/bin/delete/undelete.c
Log:
In delete:
* Apply patches from jik:
- Change the ENOMATCH error constant to DELETE_ENOMATCH to avoid
conflicting with a system error constant of the same name
Modified: trunk/athena/bin/delete/debian/changelog
===================================================================
--- trunk/athena/bin/delete/debian/changelog 2009-03-29 19:55:41 UTC (rev 23659)
+++ trunk/athena/bin/delete/debian/changelog 2009-03-29 19:55:42 UTC (rev 23660)
@@ -4,8 +4,10 @@
- When recursively deleting a directory, read in the directory's
entire contents before deleting anything so readdir doesn't get
confused
+ - Change the ENOMATCH error constant to DELETE_ENOMATCH to avoid
+ conflicting with a system error constant of the same name
- -- Evan Broder <broder@mit.edu> Sun, 29 Mar 2009 14:50:37 -0400
+ -- Evan Broder <broder@mit.edu> Sun, 29 Mar 2009 14:55:58 -0400
debathena-delete (10.0.0-0debathena1) unstable; urgency=low
Modified: trunk/athena/bin/delete/delete_errs.et
===================================================================
--- trunk/athena/bin/delete/delete_errs.et 2009-03-29 19:55:41 UTC (rev 23659)
+++ trunk/athena/bin/delete/delete_errs.et 2009-03-29 19:55:42 UTC (rev 23660)
@@ -36,7 +36,7 @@
"can't find home directory"
ec INTERNAL_ERROR,
"strange internal error"
-ec ENOMATCH,
+ec DELETE_ENOMATCH,
"no match"
ec EXPUNGE_NOT_EXPUNGED,
""
Modified: trunk/athena/bin/delete/expunge.c
===================================================================
--- trunk/athena/bin/delete/expunge.c 2009-03-29 19:55:41 UTC (rev 23659)
+++ trunk/athena/bin/delete/expunge.c 2009-03-29 19:55:42 UTC (rev 23660)
@@ -233,7 +233,7 @@
}
}
else {
- set_error(ENOMATCH);
+ set_error(DELETE_ENOMATCH);
error(files[num - 1]);
}
}
Modified: trunk/athena/bin/delete/lsdel.c
===================================================================
--- trunk/athena/bin/delete/lsdel.c 2009-03-29 19:55:41 UTC (rev 23659)
+++ trunk/athena/bin/delete/lsdel.c 2009-03-29 19:55:42 UTC (rev 23660)
@@ -192,7 +192,7 @@
}
}
else {
- set_error(ENOMATCH);
+ set_error(DELETE_ENOMATCH);
error(args[num - 1]);
status = error_code;
continue;
Modified: trunk/athena/bin/delete/undelete.c
===================================================================
--- trunk/athena/bin/delete/undelete.c 2009-03-29 19:55:41 UTC (rev 23659)
+++ trunk/athena/bin/delete/undelete.c 2009-03-29 19:55:42 UTC (rev 23660)
@@ -188,7 +188,7 @@
set_error(ENOENT)
}
else
- set_error(ENOMATCH);
+ set_error(DELETE_ENOMATCH);
error(name);
return error_code;
}
