Merge pull request #24 from minfrin/giveup

Avoid the final delay when running a command a specific number of times.

Author: minfrin

.github/workflows/full-check.yml

@@ -15,6 +15,7 @@ jobs:
       run: |
            autoreconf -fi
            ./configure
+           make
            make dist
            head retry.1; cat retry.1 | grep -C5 "try forever" || exit 1
 

ChangeLog

@@ -1,6 +1,9 @@
 
 Changes with v1.0.6
 
+  *) Avoid the final delay when running a command a
+     specific number of times. [Graham Leggett]
+
   *) Generate the man page during the dist hook, and not
      at build time. This makes life easy for parallel and
      cross compiled builds. [Graham Leggett]

Makefile.am

@@ -7,6 +7,9 @@ retry_SOURCES = retry.c
 EXTRA_DIST = retry.spec
 dist_man_MANS = retry.1
 
-retry.1: retry
-	./retry --help | txt2man -s 1 -t "${PACKAGE_NAME}" -r "${PACKAGE_NAME}-${PACKAGE_VERSION}" > retry.1
+dist-hook: retry retry.1
+	install retry.1 $(distdir)/retry.1
+
+retry.1:
+	./retry --help | txt2man -d 1 -t "${PACKAGE_NAME}" -r "${PACKAGE_NAME}-${PACKAGE_VERSION}" > retry.1
 

README.md

@@ -19,13 +19,7 @@ dnf copr enable minfrin/retry
 dnf install retry
 ```
 
-There is also a [PPA] for Ubuntu as follows:
-
-```
-sudo add-apt-repository ppa:minfrin/retry
-sudo apt-get update
-sudo apt-get install retry
-```
+The retry tool is available by default on Debian derived systems.
 
 # example
 ```
@@ -57,6 +51,14 @@ retry: false returned 1, backing off for 64 seconds and trying again...
 retry: false returned 1, backing off for 64 seconds and trying again...
 retry: false returned 1, backing off for 64 seconds and trying again...
 ^C
+```
+
+# fixed number of times
+```
+~$ retry --times=3 -- false
+retry: false returned 1, backing off for 10 seconds and trying again...
+retry: false returned 1, backing off for 10 seconds and trying again...
+retry: false returned 1, giving up.
 ```
 
   [COPR]: <https://copr.fedorainfracloud.org/coprs/minfrin/retry/>

config.h.in

@@ -13,15 +13,15 @@
    to 0 otherwise. */
 #undef HAVE_MALLOC
 
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
 /* Define to 1 if stdbool.h conforms to C99. */
 #undef HAVE_STDBOOL_H
 
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
 
-/* Define to 1 if you have the <stdio.h> header file. */
-#undef HAVE_STDIO_H
-
 /* Define to 1 if you have the <stdlib.h> header file. */
 #undef HAVE_STDLIB_H
 
@@ -67,9 +67,7 @@
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
-/* Define to 1 if all of the C90 standard headers exist (not just the ones
-   required in a freestanding environment). This macro is provided for
-   backward compatibility; new code need not use it. */
+/* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
 
 /* Version number of package */
@@ -89,7 +87,7 @@
 /* Define to rpl_malloc if the replacement function should be used. */
 #undef malloc
 
-/* Define as a signed integer type capable of holding a process identifier. */
+/* Define to `int' if <sys/types.h> does not define. */
 #undef pid_t
 
 /* Define to `unsigned int' if <sys/types.h> does not define. */

retry.c

@@ -120,7 +120,7 @@ static int help(const char *name, const char *msg, int code)
             "    when repeat has backed off. Defaults to the\n"
             "    command name.\n"
             "\n"
-            "  -t times, --times=times  The number of times to retry\n"
+            "  -t times, --times=times  Total number of times to try\n"
             "    the command. By default we try forever.\n"
             "\n"
             "  -u criteria, --until=criteria  Keep repeating the command until any one\n"
@@ -183,6 +183,13 @@ static int help(const char *name, const char *msg, int code)
             "\tretry: false returned 1, backing off for 64 seconds and trying again...\n"
             "\t^C\n"
             "\n"
+            "  In this example, we try three times before giving up.\n"
+            "\n"
+    		"\t~$ retry --times=3 -- false\n"
+            "\tretry: false returned 1, backing off for 10 seconds and trying again...\n"
+            "\tretry: false returned 1, backing off for 10 seconds and trying again...\n"
+            "\tretry: false returned 1, giving up.\n"
+            "\n"
             "AUTHOR\n"
             "  Graham Leggett <[email protected]>\n"
             "", msg ? msg : "", n, n);
@@ -595,6 +602,14 @@ int main (int argc, char **argv)
                 free(pumps[STDOUT_FD].base);
                 memset(&pumps[STDOUT_FD], 0, sizeof(pump_t));
 
+                /* last try? give up */
+                if (times == 1) {
+                    fprintf(stderr,
+                            "%s: %s returned %d, giving up.\n",
+                            name, message ? message : argv[optind], status);
+                    break;
+                }
+
                 if (delay[0]) {
                     d = strtol(delay, &delay, 10);
                 }