Support for ## as track # replacement token in basename

Author: twojstaryzdomu

ChangeLog

@@ -74,3 +74,6 @@
 	Sealed various memory leaks. Refactored exit statements.
 
 	Abort further processing if output file already exists.
+
+	Added support for ## as track # replacement token in the basename
+	parameter.

README

@@ -128,6 +128,8 @@
   	of the created track files. By default, the output files are
   	now named after the basename of the source image file or the
   	track #, ending with the appropriate format extension.
+  	basename may contain the track token '##' which will be
+  	replaced by the track number.
 
 	The -t flag adds the track # in the output filename between
 	the basename & the extension, as in versions prior to 1.2.3.

bchunk.1

@@ -19,7 +19,8 @@ as listed in the cue sheet. The wildcard '*' (single quoted to
 prevent shell expansion) selects all tracks from a cue sheet for
 conversion. image.cue is the cue sheet file containing track types
 and offsets. basename is optionally used for the beginning part of
-the created track files.
+the created track files. basename may contain the track token ##
+which will be replaced by the track number.
 .LP
 The produced .iso track contains an ISO file system, which can be
 mounted through a loop device on Linux systems, or

bchunk.c

@@ -59,6 +59,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
@@ -439,7 +441,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);
@@ -460,6 +462,19 @@ int set_output(struct track_t *track, char *binfile, char *basefile, int trackad
 			if (asprintf(&bname, "%s", basefile) == -1)
 				die(4, "set_output(): asprintf() failed, out of memory\n");
 	}
+	if (basefile)
+		if ((e = strstr(basefile, TRACK_TOKEN))) {
+			int l = e - basefile;
+			if (!(s = calloc(l + 1, 1)))
+				die(4, "set_output(): calloc() failed, out of memory\n");
+			strncpy(s, basefile, l);
+			if (bname)
+				t = bname;
+			if (asprintf(&bname, "%s%.2d%s", s, track->num, e + strlen(TRACK_TOKEN)) == -1)
+				die(4, "set_output(): asprintf() failed, out of memory\n");
+			free(s);
+			free(t);
+		}
 	if (trackadd) {
 		if (bname)
 			t = bname;