hitting enter in fuser means no

diff --git a/ChangeLog b/ChangeLog
index 66b33672122eb075591a86c2baad56aca467b755..56a4207eb76d5a506c0a866c659c6181db02b457 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,11 @@
 Changes in 21.1
 ===============
+2002-08-19
+       * Changed killall.1 to be less ambigous, Debian #127851
 2002-08-18
        * Added patches from James Morrison so it works on Hurd
        * Fixed UTF8 Problem. closes Debian #140960
+       * Return for fuser -k will mean no.
 
 2002-08-17
        * Now has LFS support. Closes Debian #129157 and #156017

diff --git a/doc/killall.1 b/doc/killall.1
index c11799f51b9c7f4ef0a8c08ece4e09f2488fd30c..2e1621e98d5341d555cc093abaf415f27f230b3d 100644 (file)
--- a/doc/killall.1
+++ b/doc/killall.1
@@ -33,9 +33,8 @@ Signals can be specified either by name (e.g. \fB\-HUP\fP) or by number
 If the command name contains a slash (\fB/\fP), processes executing that
 particular file will be selected for killing, independent of their name.
 .PP
-\fBkillall\fP returns a non-zero return code if no process has been killed
-for any of the listed commands. If at least one process has been killed for
-each command, \fBkillall\fP returns zero.
+\fBkillall\fP returns a zero return code if at least one process has been 
+killed for each ilisted command. \fBkillall\fP returns zero otherwise.
 .PP
 A \fBkillall\fP process never kills itself (but may kill other \fBkillall\fP
 processes).

diff --git a/src/fuser.c b/src/fuser.c
index c6998a01e67df25bc513a4e97adb7735e6fc5f77..bc88ac828cf511de1fab7e7dc05eeb85e53f98a6 100644 (file)
--- a/src/fuser.c
+++ b/src/fuser.c
@@ -586,20 +586,19 @@ ask (pid_t pid)
   int ch, c;
 
   fflush (stdout);
-  do
-    {
-      fprintf (stderr, _("Kill process %d ? (y/n) "), pid);
-      fflush (stderr);
-      do
-       if ((ch = getchar ()) == EOF)
-         exit (0);
-      while (ch == '\n' || ch == '\t' || ch == ' ');
-      do
-       if ((c = getchar ()) == EOF)
-         exit (0);
-      while (c != '\n');
-    }
-  while (ch != 'y' && ch != 'n' && ch != 'Y' && ch != 'N');
+  do {
+    fprintf (stderr, _("Kill process %d ? (y/n) "), pid);
+    fflush (stderr);
+    do {
+      if ((ch = getchar ()) == EOF)
+        exit (0);
+      if (ch == '\n') return 0;
+    } while (ch == '\t' || ch == ' ');
+    do
+      if ((c = getchar ()) == EOF)
+           exit (0);
+    while (c != '\n');
+  } while (ch != '\n' && ch != 'y' && ch != 'n' && ch != 'Y' && ch != 'N');
   return ch == 'y' || ch == 'Y';
 }