Commit 7c7cffe6 authored by Marc Vef's avatar Marc Vef
Browse files

gfind/sfind fix broken find argument order enforcement

parent cc4266a9

examples/gfind/gfind.cpp

+14 −6
Original line number Diff line number Diff line
@@ -200,6 +200,14 @@ pfind_options_t *pfind_parse_args(int argc, char **argv, int force_print_help, 
      }

      argv[i][0] = 0;

      argv[++i][0] = 0;

    } else if(strcmp(argv[i], "-M") == 0) {

        res->mountdir = strdup(argv[i + 1]);

        argv[i][0] = 0;

        argv[++i][0] = 0;

    } else if(strcmp(argv[i], "-S") == 0) {

        res->num_servers = atoi(argv[i + 1]);

        argv[i][0] = 0;

        argv[++i][0] = 0;

    } else if (!firstarg) {

      firstarg = strdup(argv[i]);

      argv[i][0] = 0;
@@ -254,12 +262,12 @@ pfind_options_t *pfind_parse_args(int argc, char **argv, int force_print_help, 
    case 's':

      res->stonewall_timer = atol(optarg);

      break;

    case 'S':

      res->num_servers = atoi(optarg);

      break;

    case 'M':

      res->mountdir = strdup(optarg);

      break;

      //    case 'S':

      //      res->num_servers = atoi(optarg);

      //      break;

      //    case 'M':

      //      res->mountdir = strdup(optarg);

      //      break;

    case 'v':

      res->verbosity++;

      break;

examples/gfind/sfind.cpp

+14 −6
Original line number Diff line number Diff line
@@ -209,6 +209,14 @@ pfind_options_t *pfind_parse_args(int argc, char **argv, int force_print_help){ 
      }

      argv[i][0] = 0;

      argv[++i][0] = 0;

    } else if(strcmp(argv[i], "-M") == 0) {

        res->mountdir = strdup(argv[i + 1]);

        argv[i][0] = 0;

        argv[++i][0] = 0;

    } else if(strcmp(argv[i], "-S") == 0) {

        res->num_servers = atoi(argv[i + 1]);

        argv[i][0] = 0;

        argv[++i][0] = 0;

    } else if (!firstarg) {

      firstarg = strdup(argv[i]);

      argv[i][0] = 0;
@@ -263,12 +271,12 @@ pfind_options_t *pfind_parse_args(int argc, char **argv, int force_print_help){ 
    case 's':

      res->stonewall_timer = atol(optarg);

      break;

    case 'S':

      res->num_servers = atoi(optarg);

      break;

    case 'M':

      res->mountdir = strdup(optarg);

      break;

      //    case 'S':

      //      res->num_servers = atoi(optarg);

      //      break;

      //    case 'M':

      //      res->mountdir = strdup(optarg);

      //      break;

    case 'v':

      res->verbosity++;

      break;