* mu-cmd.c: (mu mv) make --printtarget work even with target=/dev/null

This commit is contained in:
Dirk-Jan C. Binnema
2011-08-05 08:20:26 +03:00
parent 61ab894ab4
commit 8e6429a764

View File

@ -316,8 +316,11 @@ mu_cmd_mv (MuConfig *opts)
if (unlink (opts->params[1]) != 0) { if (unlink (opts->params[1]) != 0) {
g_warning ("unlink failed: %s", strerror (errno)); g_warning ("unlink failed: %s", strerror (errno));
return MU_EXITCODE_ERROR; return MU_EXITCODE_ERROR;
} else } else {
if (opts->printtarget) /* if the move worked, print */
g_print ("%s\n", "/dev/null"); /* /dev/null */
return MU_EXITCODE_OK; return MU_EXITCODE_OK;
}
} }
err = NULL; err = NULL;
@ -329,17 +332,19 @@ mu_cmd_mv (MuConfig *opts)
g_error_free (err); g_error_free (err);
} }
return MU_EXITCODE_ERROR; return MU_EXITCODE_ERROR;
} else if (opts->printtarget) /* if the move worked, print the */ } else {
g_print ("%s\n", fullpath); /* target (if user set if (opts->printtarget)
* --printtarget) */ g_print ("%s\n", fullpath);
return MU_EXITCODE_OK;
}
g_free (fullpath); g_free (fullpath);
return MU_EXITCODE_OK; return MU_EXITCODE_OK;
} }
static gboolean static gboolean
check_file_okay (const char *path, gboolean cmd_add) check_file_okay (const char *path, gboolean cmd_add)
{ {