Permit ## as track token in basename

Author: twojstaryzdomu

bchunk.c

@@ -56,6 +56,8 @@
 #define WAV_DATA_HLEN 8
 #define WAV_HEADER_LEN WAV_RIFF_HLEN + WAV_FORMAT_HLEN + WAV_DATA_HLEN
 
+#define TRACK_TOKEN "##"
+
 /*
  *	Ugly way to convert integers to little-endian format.
  *	First let netinet's hton() functions decide if swapping should
@@ -435,7 +437,7 @@ int writetrack(FILE *bf, struct track_t *track)
  */
 
 int set_output(struct track_t *track, char *binfile, char *basefile, int trackadd) {
-	char *t;
+	char *e, *s, *t;
 	if (strchr(binfile, '*')) {
 		if (!basefile)
 			bname = prune_ext(track->file);
@@ -456,6 +458,20 @@ int set_output(struct track_t *track, char *binfile, char *basefile, int trackad
 			if (asprintf(&bname, "%s", basefile) == -1)
 				die(3, "set_output(): asprintf() failed, out of memory\n");
 	}
+	if (basefile)
+		if (e = strstr(basefile, TRACK_TOKEN)) {
+			int l = e - basefile;
+			if (!(s = malloc(l + 1)))
+				die(3, "set_output(): malloc() failed, out of memory\n");
+			strncpy(s, basefile, l);
+			s[l] = '\0';
+			if (bname)
+				t = bname;
+			if (asprintf(&bname, "%s%.2d%s", s, track->num, e + strlen(TRACK_TOKEN)) == -1)
+				die(3, "set_output(): asprintf() failed, out of memory\n");
+			free(s);
+			free(t);
+		}
 	if (trackadd) {
 		if (bname)
 			t = bname;
@@ -469,9 +485,9 @@ int set_output(struct track_t *track, char *binfile, char *basefile, int trackad
 	bname = NULL;
 	if (strcmp(track->output, track->file) == 0)
 		die_format(3,	"%2d: skipped: output file %s same as input file, aborting\n"
-				"\nUse '-t' to include track # in output filename. "
+				"\nUse '-t' to include track # in filename or set '%s' in basename. "
 				"Remaining tracks were not processed\n",
-				track->num, track->output);
+				track->num, track->output, TRACK_TOKEN);
 	return 1;
 }