X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=bin%2Fad%2Fad_mv.c;h=156d648b004a5d2fe0f26a6a30ef1b95b4378651;hb=6d60f95c388da5f8f901d67e0018cf4896e6c6dc;hp=0355364398e81183e566f040ee1a53e0d16d7265;hpb=f357762920325c7d84ec891e468655fea5b4473e;p=netatalk.git diff --git a/bin/ad/ad_mv.c b/bin/ad/ad_mv.c index 03553643..156d648b 100644 --- a/bin/ad/ad_mv.c +++ b/bin/ad/ad_mv.c @@ -186,7 +186,7 @@ int ad_mv(int argc, char *argv[]) set_signal(); cnid_init(); if (openvol(argv[argc - 1], &dvolume) != 0) { - SLOG("Error opening CNID database for %s: ", argv[argc - 1]); + SLOG("Error opening CNID database for source \"%s\": ", argv[argc - 1]); return 1; } @@ -198,7 +198,7 @@ int ad_mv(int argc, char *argv[]) if (argc > 2) usage_mv(); if (openvol(argv[0], &svolume) != 0) { - SLOG("Error opening CNID database for %s: ", argv[0]); + SLOG("Error opening CNID database for destination \"%s\": ", argv[0]); return 1; } rval = do_move(argv[0], argv[1]); @@ -235,11 +235,8 @@ int ad_mv(int argc, char *argv[]) rval = 1; } else { memmove(endp, p, (size_t)len + 1); - if (openvol(*argv, &svolume) != 0) { - SLOG("Error opening CNID database for %s: ", argv[0]); - rval = 1; - goto exit; - } + openvol(*argv, &svolume); + if (do_move(*argv, path)) rval = 1; closevol(&svolume);