File psmisc-23.0.dif of Package psmisc.7891

Overview Repositories Revisions Requests Users Attributes Meta

File psmisc-23.0.dif of Package psmisc.7891

---
 configure.ac    |    4 ++--
 doc/Makefile.am |    2 +-
 src/fuser.c     |    5 ++++-
 3 files changed, 7 insertions(+), 4 deletions(-)

--- configure.ac
+++ configure.ac	2018-06-22 16:47:02.758993991 +0000
@@ -45,7 +45,7 @@ fi
 if test "$enable_timeout_stat" = "static"; then
   AC_DEFINE([WITH_TIMEOUT_STAT], [2], [Use timeout on stat calls])
 fi
-AM_CONDITIONAL([WANT_TIMEOUT_STAT], [test "$enable_timeout_stat" = "static"])
+AM_CONDITIONAL([WANT_TIMEOUT_STAT], [test "$enable_timeout_stat" != "no"])
 
 # Use /proc/self/mountinfo if available
 if test -e /proc/self/mountinfo ; then
@@ -142,7 +142,7 @@ AC_CHECK_MEMBERS([struct user_regs_struc
 		struct user_regs_struct.rdi,
 		struct user_regs_struct.rsi,
 		struct user_regs_struct.rdx], [],[],
-    [#include <bits/types.h>
+    [#include <sys/types.h>
      #include <sys/user.h>])
 AC_CHECK_MEMBERS([struct pt_regs.orig_gpr3,
 		struct pt_regs.gpr], [],[], [#include <linux/ptrace.h>])
--- doc/Makefile.am
+++ doc/Makefile.am	2018-06-22 16:47:02.842992443 +0000
@@ -1,5 +1,5 @@
 
-man_MANS = killall.1 peekfd.1 prtstat.1 pstree.1
+man_MANS = killall.1 peekfd.1 prtstat.1 pstree.1 pslog.1
 EXTRA_MANS = 
 
 if WANT_FUSER
--- src/fuser.c
+++ src/fuser.c	2018-06-22 16:47:02.926990894 +0000
@@ -1097,6 +1097,7 @@ int main(int argc, char *argv[])
 	struct option *optr;
 	char *nsptr;
 	int skip_argv;
+	int seen_file;
 
 	struct option options[] = {
 		{"all", 0, NULL, 'a'},
@@ -1140,6 +1141,7 @@ int main(int argc, char *argv[])
 #endif
 	atexit(atexit_free_lists);
 
+	seen_file = 0;
 	for (argc_cnt = 1; argc_cnt < argc; argc_cnt++) {
 		current_argv = argv[argc_cnt];
 		if (current_argv[0] == '-') {	/* its an option */
@@ -1285,6 +1287,7 @@ int main(int argc, char *argv[])
 			}
 		}
 		this_name->matched_procs = NULL;
+		seen_file = 1;
 		if (opts & (OPT_MOUNTS | OPT_ISMOUNTPOINT)
 		    && this_name->name_space != NAMESPACE_FILE) {
 			free(this_name);
@@ -1338,7 +1341,7 @@ int main(int argc, char *argv[])
 			names_tail->next = this_name;
 		names_tail = this_name;
 	}			/* for across the argvs */
-	if (names_head == NULL)
+	if (names_head == NULL && !seen_file)
 		usage(_("No process specification given"));
 
 	/* Check if -M flag was used and if so check mounts */

Places

File psmisc-23.0.dif of Package psmisc.7891

Places