pmap: restore a proper response when arguments missing

Ever since pmap was refactored via the reference below
(and sprinkled with those damn tabs), the response for
the absence of any argument has been an error message.

This patch restores the proper behavior ('usage' text)
and updates the dejagnu 'no arguments' expect pattern.

Reference(s):
commit d50884788df5a9706ecba6a0966f48ef8f213f41

Signed-off-by: Jim Warner <james.warner@comcast.net>

diff --git a/pmap.c b/pmap.c
index d21517ae2bc9f2a7b362621d84359927b290a167..d24fc663a79134a69e225dcc312bd73f2eebe1b4 100644 (file)
--- a/pmap.c
+++ b/pmap.c
@@ -994,6 +994,9 @@ int main(int argc, char **argv)
        textdomain(PACKAGE);
        atexit(close_stdout);
 
+       if (argc < 2)
+               usage(stderr);
+
        while ((c = getopt_long(argc, argv, "xXrdqA:hVcC:nN:p", longopts, NULL)) != -1)
                switch (c) {
                case 'x':

diff --git a/testsuite/pmap.test/pmap.exp b/testsuite/pmap.test/pmap.exp
index eac9483ca459b0ed4fda08f693076ff4587d7345..ffbdb4f6f96ca8f0e4face0f03e7e6e453bce81a 100644 (file)
--- a/testsuite/pmap.test/pmap.exp
+++ b/testsuite/pmap.test/pmap.exp
@@ -21,8 +21,8 @@ set pmap_ext_footer "\[ -\]+\\s+total kB\\s+\\d+(\\s+\[\\d-\]+){2,3}\\s*\$"
 
 set test "pmap with no arguments"
 spawn $pmap
-expect_pass "$test" "^\(lt-\)\?pmap: argument missing"
-#expect_pass "$test" "^Usage: pmap \\\[-x | -d\\\] \\\[-q\\\] \\\[-A low,high\\\] pid\\.\\.\\.\\s+-x\\s+show details\\s+-d\\s+show offset and device number\\s+-q\\s+quiet; less header/footer info\\s+-V\\s+show the version number\\s+-A\\s+limit results to the given range\\s*"
+#expect_pass "$test" "^\(lt-\)\?pmap: argument missing"
+expect_pass "$test" "Usage:\\s+\(lt-\)?pmap \\\[options\\\] pid \\\[pid \.\.\.\\\]"
 
 set test "pmap standard output"
 spawn $pmap $mypid