Imported Upstream version 2.6.1p1

[debian/amanda] / application-src / amgtar.c

diff --git a/application-src/amgtar.c b/application-src/amgtar.c
index c3e59666b1d473dfa5607a336b94f9d3a378916c..8bdbb058f0e6978d27881fd5c96fe75ceb980734 100644 (file)
--- a/application-src/amgtar.c
+++ b/application-src/amgtar.c
@@ -483,7 +483,7 @@ main(
     if (exit_handling) {
        char *s = exit_handling;
        while (s) {
-           char *r = index(s, '=');
+           char *r = strchr(s, '=');
            if (r) {
                int j = atoi(s);
                if (j >= 0 && j < 256) {
@@ -491,9 +491,9 @@ main(
                    if (strncasecmp(r, "GOOD", 4) == 0) {
                        exit_value[j] = 0;
                    }
-                   s = index(s, ' ');
                }
            }
+           s = strchr(s+1, ' ');
        }
     }
 
@@ -909,7 +909,7 @@ amgtar_backup(
        g_fprintf(mesgstream, "sendbackup: error [%s]\n", errmsg);
     }
 
-    if (incrname && strlen(incrname) > 4) {
+    if (!errmsg && incrname && strlen(incrname) > 4) {
        char *nodotnew;
        nodotnew = stralloc(incrname);
        nodotnew[strlen(nodotnew)-4] = '\0';