ff2e4eb7c4
checked in (request 48511) OBS-URL: https://build.opensuse.org/request/show/48511 OBS-URL: https://build.opensuse.org/package/show/Base:System/psmisc?expand=0&rev=25
50 lines
1.6 KiB
Plaintext
50 lines
1.6 KiB
Plaintext
--- configure.ac
|
|
+++ configure.ac 2010-07-13 13:54:30.000000000 +0000
|
|
@@ -66,7 +66,8 @@ AC_CHECK_MEMBERS([struct user_regs_struc
|
|
struct user_regs_struct.rdi,
|
|
struct user_regs_struct.rsi,
|
|
struct user_regs_struct.rdx], [],[],
|
|
- [#include <sys/user.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>])
|
|
AC_CHECK_MEMBERS([struct pt_regs.uregs],[],[], [#include <asm/ptrace.h>])
|
|
--- src/fuser.c
|
|
+++ src/fuser.c 2010-07-13 15:01:58.000000000 +0000
|
|
@@ -1120,7 +1120,8 @@ int main(int argc, char *argv[])
|
|
char option_buf[3];
|
|
struct option *optr;
|
|
char *nsptr;
|
|
- int skip_argv;
|
|
+ int skip_argv;
|
|
+ int seen_file;
|
|
size_t len;
|
|
|
|
struct option options[] = {
|
|
@@ -1160,6 +1161,7 @@ int main(int argc, char *argv[])
|
|
netdev = find_net_dev();
|
|
fill_unix_cache(&unixsockets);
|
|
|
|
+ seen_file = 0;
|
|
for (argc_cnt = 1; argc_cnt < argc; argc_cnt++) {
|
|
current_argv = argv[argc_cnt];
|
|
if (current_argv[0] == '-') { /* its an option */
|
|
@@ -1291,6 +1293,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)
|
|
usage(_
|
|
@@ -1350,7 +1353,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"));
|
|
|
|
if (opts & OPT_SILENT) {
|