From f330d5e6ba8bca96481196619865905faef94618 Mon Sep 17 00:00:00 2001
From: Craig Small <csmall@users.sourceforge.net>
Date: Fri, 10 Dec 2004 11:31:29 +0000
Subject: [PATCH] added catalan translation

---
 ChangeLog       |  4 ++++
 configure.in    |  2 +-
 src/Makefile.am | 11 ++++-------
 src/fuser.c     | 28 ++++++++++++----------------
 src/killall.c   | 24 ++++++++++--------------
 5 files changed, 31 insertions(+), 38 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1552756..6b7b320 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,10 @@ Changes in 21.6 (not released yet)
 	* Fixed NLS problems and some double ))s - Thanks to Jakub Bogusz
 	* Added Basque translation
 	* More NLS related fixes - Thanks to Guillem Jover
+	* killall aborts if it gets unknown flags Debian #250794
+	* Symbolic link created properly for pstree.x11 Debian #250096
+	* Strange mount points handled better Debian #178972
+	* Added Catalan translation
 
 Changes in 21.5
 ===============
diff --git a/configure.in b/configure.in
index 217eb41..7aa6ce1 100644
--- a/configure.in
+++ b/configure.in
@@ -37,7 +37,7 @@ AC_TYPE_SIZE_T
 AC_TYPE_UID_T
 
 dnl Check for language stuff
-ALL_LINGUAS="de eu fi fr it pl pt sv"
+ALL_LINGUAS="ca de eu fi fr it pl pt sv"
 AM_GNU_GETTEXT([external])
 
 dnl Checks for library functions.
diff --git a/src/Makefile.am b/src/Makefile.am
index 596f10b..a28fd8d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,8 +3,6 @@ AM_CFLAGS = -Wall -DLOCALEDIR=\"/usr/share/locale\"
 
 bin_PROGRAMS = fuser killall pstree
 
-bin_SCRIPTS = pstree.x11
-
 fuser_SOURCES = fuser.c comm.h signals.c signals.h loop.h
 
 killall_SOURCES = killall.c comm.h signals.c signals.h 
@@ -19,7 +17,7 @@ BUILT_SOURCES = signames.h
 
 EXTRA_DIST = signames.c 
 
-CLEANFILES = signames.h pstree.x11
+CLEANFILES = signames.h
 
 signames.h: signames.c Makefile
 		@CPP@ -dM $< |\
@@ -31,7 +29,6 @@ signames.h: signames.c Makefile
 		grep '^{ 1,"HUP" },$$' signames.h >/dev/null || \
 		  { rm -f signames.h; exit 1; }
 
-Makefile:	signames.h
-
-pstree.x11:	pstree
-	ln -s pstree pstree.x11
+install-exec-hook:
+		cd $(DESTDIR)$(bindir) && \
+			$(LN_S) pstree pstree.x11
diff --git a/src/fuser.c b/src/fuser.c
index 94c2a5a..6267f4d 100644
--- a/src/fuser.c
+++ b/src/fuser.c
@@ -31,6 +31,7 @@
 #include <linux/kdev_t.h>	/* for MKDEV */
 #include <linux/major.h>	/* for LOOP_MAJOR */
 #endif
+#include <errno.h>
 
 #include "i18n.h"
 #include "comm.h"
@@ -510,24 +511,19 @@ scan_mounts (void)
     {
       if (sscanf (line, "%as %as", &path, &mounted) != 2)
 	continue;
-      /* new kernel :-) */
-      if (stat (path, &st_dev) < 0) {
-	free (path);            /* might be NFS or such */
-	free (mounted);
-	continue;		
-      }
-      if (S_ISBLK (st_dev.st_mode) && MAJOR (st_dev.st_rdev) == LOOP_MAJOR)
-	{
-          struct loop_info loopinfo;
-          int fd;
-
-          if ((fd = open(path, O_RDWR)) > 0) {
-            if (ioctl(fd, LOOP_GET_STATUS, &loopinfo) >= 0) {
-              add_other(it_loop,loopinfo.lo_device,loopinfo.lo_device,loopinfo.lo_inode,path);
-            }
-            (void) close(fd);
+      if ( stat (path, &st_dev) == 0) {
+      	if (S_ISBLK (st_dev.st_mode) && MAJOR (st_dev.st_rdev) == LOOP_MAJOR) {
+          	struct loop_info loopinfo;
+        	int fd;
+
+          	if ((fd = open(path, O_RDWR)) > 0) {
+            		if (ioctl(fd, LOOP_GET_STATUS, &loopinfo) >= 0) {
+              			add_other(it_loop,loopinfo.lo_device,loopinfo.lo_device,loopinfo.lo_inode,path);
+            		}
+            		(void) close(fd);
                 }
 	}
+      }
       if (stat (mounted, &st_mounted) < 0)
 	{
 	  perror (mounted);
diff --git a/src/killall.c b/src/killall.c
index 0f60d21..b1839e5 100644
--- a/src/killall.c
+++ b/src/killall.c
@@ -592,23 +592,19 @@ main (int argc, char **argv)
       case '?':
         /* Signal names are in uppercase, so check to see if the argv
          * is upper case */
-        if (argv[optind-1][1] >= 'A' && argv[optind-1][1] <= 'Z') 
-	  sig_num = get_signal (argv[optind-1]+1, "killall");
-        /* Might also be a -## signal too */
-        if (argv[optind-1][1] >= '0' && argv[optind-1][1] <= '9')
-          sig_num = atoi(argv[optind-1]+1);
+        if (argv[optind-1][1] >= 'A' && argv[optind-1][1] <= 'Z') {
+	      sig_num = get_signal (argv[optind-1]+1, "killall");
+        } else {
+          /* Might also be a -## signal too */
+          if (argv[optind-1][1] >= '0' && argv[optind-1][1] <= '9') {
+            sig_num = atoi(argv[optind-1]+1);
+          } else {
+            usage();
+          }
+        }
         break;
     }
   }
-/*
-	  if (*walk)
-	    if (walk != *argv + 1 || pidof)
-	      usage ();
-	    else
-	      sig_num = get_signal (*argv + 1, "killall");
-	}
-    }
-    */
   myoptind = optind;
   if (argc - myoptind < 1) 
     usage();
-- 
2.40.0