File dar-fix-move-op-clash.diff of Package dar
Index: dar-2.3.10/src/dar_suite/dar_manager.cpp
===================================================================
--- dar-2.3.10.orig/src/dar_suite/dar_manager.cpp
+++ dar-2.3.10/src/dar_suite/dar_manager.cpp
@@ -58,7 +58,7 @@ using namespace libdar;
#define MISSING_ARG "Missing argument to -%c"
#define INVALID_ARG "Invalid argument given to -%c (requires integer)"
-enum operation { none_op, create, add, listing, del, chbase, where, options, dar, restore, used, files, stats, move, interactive };
+enum operation { none_op, create, add, listing, del, chbase, where, options, dar, restore, used, files, stats, move_op, interactive };
static S_I little_main(user_interaction & dialog, S_I argc, char *argv[], const char **env);
static bool command_line(user_interaction & dialog,
@@ -155,7 +155,7 @@ S_I little_main(user_interaction & dialo
case stats:
op_stats(dialog, base, info_details);
break;
- case move:
+ case move_op:
op_move(dialog, base, num, num2, info_details);
break;
case interactive:
@@ -306,7 +306,7 @@ static bool command_line(user_interactio
case 'm':
if(op != none_op)
throw Erange("command_line", tools_printf(gettext(ONLY_ONCE), char(lu)));
- op = move;
+ op = move_op;
if(optarg == NULL)
throw Erange("command_line", tools_printf(gettext(MISSING_ARG), char(lu)));
num = atoi(optarg);
@@ -411,7 +411,7 @@ static bool command_line(user_interactio
break;
case options:
break;
- case move:
+ case move_op:
if(rest.size() != 1)
{
dialog.warning(gettext("Missing argument to command line, aborting"));