Applied patch from David Douthitt to re-add -print option to find.

Closes bug #1144.

diff --git a/applets/usage.h b/applets/usage.h
index 8ec0170e22a151446fa69b0d9ad6f6daea279d80..dde3dd14659ea4bbdd4856a2a6c7eeb2003fd756 100644 (file)
--- a/applets/usage.h
+++ b/applets/usage.h
@@ -429,6 +429,7 @@
        "\nEXPRESSION may consist of:\n" \
        "\t-follow\t\tDereference symbolic links.\n" \
        "\t-name PATTERN\tFile name (leading directories removed) matches PATTERN." \
+       "\t-print\t\tPrint (default and assumed).\n" \
        USAGE_FIND_TYPE( \
        "\n\t-type X\t\tFiletype matches X (where X is one of: f,d,l,b,c,...)" \
 ) USAGE_FIND_PERM( \

diff --git a/find.c b/find.c
index 15e693ab9acd628b50688a15afd1b24283588d62..e814c97b973194370592bfe296e28e0705900214 100644 (file)
--- a/find.c
+++ b/find.c
@@ -143,6 +143,9 @@ int find_main(int argc, char **argv)
        for (i = firstopt; i < argc; i++) {
                if (strcmp(argv[i], "-follow") == 0)
                        dereference = TRUE;
+               else if (strcmp(argv[i], "-print") == 0) {
+                       ;
+                       }
                else if (strcmp(argv[i], "-name") == 0) {
                        if (++i == argc)
                                error_msg_and_die("option `-name' requires an argument");

diff --git a/findutils/find.c b/findutils/find.c
index 15e693ab9acd628b50688a15afd1b24283588d62..e814c97b973194370592bfe296e28e0705900214 100644 (file)
--- a/findutils/find.c
+++ b/findutils/find.c
@@ -143,6 +143,9 @@ int find_main(int argc, char **argv)
        for (i = firstopt; i < argc; i++) {
                if (strcmp(argv[i], "-follow") == 0)
                        dereference = TRUE;
+               else if (strcmp(argv[i], "-print") == 0) {
+                       ;
+                       }
                else if (strcmp(argv[i], "-name") == 0) {
                        if (++i == argc)
                                error_msg_and_die("option `-name' requires an argument");

diff --git a/include/usage.h b/include/usage.h
index 8ec0170e22a151446fa69b0d9ad6f6daea279d80..dde3dd14659ea4bbdd4856a2a6c7eeb2003fd756 100644 (file)
--- a/include/usage.h
+++ b/include/usage.h
@@ -429,6 +429,7 @@
        "\nEXPRESSION may consist of:\n" \
        "\t-follow\t\tDereference symbolic links.\n" \
        "\t-name PATTERN\tFile name (leading directories removed) matches PATTERN." \
+       "\t-print\t\tPrint (default and assumed).\n" \
        USAGE_FIND_TYPE( \
        "\n\t-type X\t\tFiletype matches X (where X is one of: f,d,l,b,c,...)" \
 ) USAGE_FIND_PERM( \

diff --git a/usage.h b/usage.h
index 8ec0170e22a151446fa69b0d9ad6f6daea279d80..dde3dd14659ea4bbdd4856a2a6c7eeb2003fd756 100644 (file)
--- a/usage.h
+++ b/usage.h
@@ -429,6 +429,7 @@
        "\nEXPRESSION may consist of:\n" \
        "\t-follow\t\tDereference symbolic links.\n" \
        "\t-name PATTERN\tFile name (leading directories removed) matches PATTERN." \
+       "\t-print\t\tPrint (default and assumed).\n" \
        USAGE_FIND_TYPE( \
        "\n\t-type X\t\tFiletype matches X (where X is one of: f,d,l,b,c,...)" \
 ) USAGE_FIND_PERM( \