comparison stream/stream_cue.c @ 30760:937621eaa290

Avoid code duplication and excessively deep nesting in cue_find_bin

30759:76a6338e5e71

/* FIXME: the string operations ( strcpy,strcat ) below depend
 * on the arrays to have the same size, thus we need to make
 * sure the sizes are in sync.
 */
static int cue_find_bin (char *firstline) {
  int i,j;
  char s[256];
  char t[256];

  /* get the filename out of that */

    }
    bin_filename[j+1] = '\0';

  }

  /* now try to open that file, without path */
  fd_bin = open (bin_filename, O_RDONLY);
  if (fd_bin == -1)
  {
    mp_msg(MSGT_OPEN,MSGL_STATUS, MSGTR_MPDEMUX_CUEREAD_BinFilenameTested,
           bin_filename);

    /* now try to find it with the path of the cue file */
    snprintf(s,sizeof( s ),"%s/%s",bincue_path,bin_filename);
    fd_bin = open (s, O_RDONLY);
    if (fd_bin == -1)
    {
      mp_msg(MSGT_OPEN,MSGL_STATUS,
             MSGTR_MPDEMUX_CUEREAD_BinFilenameTested, s);
      /* now I would say the whole filename is shit, build our own */
      strncpy(s, cue_filename, strlen(cue_filename) - 3 );
      s[strlen(cue_filename) - 3] = '\0';
      strcat(s, "bin");
      fd_bin = open (s, O_RDONLY);
      if (fd_bin == -1)
      {
        mp_msg(MSGT_OPEN,MSGL_STATUS,
               MSGTR_MPDEMUX_CUEREAD_BinFilenameTested, s);

        /* ok try it with path */
        snprintf(t, sizeof( t ), "%s/%s", bincue_path, s);
        fd_bin = open (t, O_RDONLY);
        if (fd_bin == -1)
        {
          mp_msg(MSGT_OPEN,MSGL_STATUS,
                 MSGTR_MPDEMUX_CUEREAD_BinFilenameTested,t);
          /* now I would say the whole filename is shit, build our own */
          strncpy(s, cue_filename, strlen(cue_filename) - 3 );
          s[strlen(cue_filename) - 3] = '\0';
          strcat(s, "img");
          fd_bin = open (s, O_RDONLY);
          if (fd_bin == -1)
          {
            mp_msg(MSGT_OPEN,MSGL_STATUS,
                   MSGTR_MPDEMUX_CUEREAD_BinFilenameTested, s);
            /* ok try it with path */
            snprintf(t, sizeof( t ), "%s/%s", bincue_path, s);
            fd_bin = open (t, O_RDONLY);
            if (fd_bin == -1)
            {
              mp_msg(MSGT_OPEN,MSGL_STATUS,
                     MSGTR_MPDEMUX_CUEREAD_BinFilenameTested, s);

              /* I'll give up */
              mp_msg(MSGT_OPEN,MSGL_ERR,
                     MSGTR_MPDEMUX_CUEREAD_CannotFindBinFile);
              return -1;
            }
          }
        } else strcpy(bin_filename, t);

      } else strcpy(bin_filename, s);

    } else strcpy(bin_filename, s);

  }

  mp_msg(MSGT_OPEN,MSGL_INFO,
         MSGTR_MPDEMUX_CUEREAD_UsingBinFile, bin_filename);
  return 0;
}

30760:937621eaa290

/* FIXME: the string operations ( strcpy,strcat ) below depend
 * on the arrays to have the same size, thus we need to make
 * sure the sizes are in sync.
 */
static int cue_find_bin (char *firstline) {
  const char *cur_name;
  int i,j;
  char s[256];
  char t[256];

  /* get the filename out of that */

    }
    bin_filename[j+1] = '\0';

  }

  fd_bin = -1;
  for (i = 0; fd_bin == -1 && i < 6; i++) {
    switch (i) {
    case 0:
  /* now try to open that file, without path */
      cur_name = bin_filename;
      break;
    case 1:
    /* now try to find it with the path of the cue file */
    snprintf(s,sizeof( s ),"%s/%s",bincue_path,bin_filename);
      cur_name = s;
      break;
    case 2:
      /* now I would say the whole filename is shit, build our own */
      strncpy(s, cue_filename, strlen(cue_filename) - 3 );
      s[strlen(cue_filename) - 3] = '\0';
      strcat(s, "bin");
      cur_name = s;
      break;
    case 3:
        /* ok try it with path */
        snprintf(t, sizeof( t ), "%s/%s", bincue_path, s);
        fd_bin = open (t, O_RDONLY);
      cur_name = t;
      break;
    case 4:
          /* now I would say the whole filename is shit, build our own */
          strncpy(s, cue_filename, strlen(cue_filename) - 3 );
          s[strlen(cue_filename) - 3] = '\0';
          strcat(s, "img");
      cur_name = s;
      break;
    case 5:
            /* ok try it with path */
            snprintf(t, sizeof( t ), "%s/%s", bincue_path, s);
      cur_name = t;
      break;
    }
    fd_bin = open(cur_name, O_RDONLY);
    if (fd_bin == -1) {
      mp_msg(MSGT_OPEN,MSGL_STATUS, MSGTR_MPDEMUX_CUEREAD_BinFilenameTested,
            cur_name);
    }
  }

            if (fd_bin == -1)
            {
              /* I'll give up */
              mp_msg(MSGT_OPEN,MSGL_ERR,
                     MSGTR_MPDEMUX_CUEREAD_CannotFindBinFile);
              return -1;
            }

  if (cur_name != bin_filename)
    strcpy(bin_filename, cur_name);

  mp_msg(MSGT_OPEN,MSGL_INFO,
         MSGTR_MPDEMUX_CUEREAD_UsingBinFile, bin_filename);
  return 0;
}