Add basename variable (Issue #44)

Author: michaelrsweet

CHANGES.md

@@ -26,6 +26,7 @@ libcups v3.0b1 (Month DD, YYYY)
 - Added, modernized, and promoted the localization interfaces to public API
   (Issue #24)
 - Added public JSON API (Issue #31)
+- Added new `basename` variable for use in ipptool files (Issue #44)
 - Updated the CUPS API for consistency.
 - Fixed ipptool's handling of EXPECT for member attributes (Issue #4)
 - Fixed ipptool's support for octetString values (Issue #23)

doc/ipptoolfile.html

@@ -699,6 +699,12 @@ <h3 id="ipptoolfile-5.description.variables">Variables</h3>
 </p>
     <p style="margin-left: 2.5em; text-indent: -2.5em;"><strong>$ENV[</strong><em>name</em><strong>]</strong><br>
 Inserts the value of the named environment variable, or an empty string if the environment variable is not defined.
+</p>
+    <p style="margin-left: 2.5em; text-indent: -2.5em;"><strong>$basename</strong><br>
+Inserts the base filename (without directory path) of the path provided to
+<strong>ipptool</strong>(8)
+
+with the <em>-f</em> option.
 </p>
     <p style="margin-left: 2.5em; text-indent: -2.5em;"><strong>$date-current</strong><br>
 Inserts the current date and time using the ISO-8601 format (&quot;yyyy-mm-ddThh:mm:ssZ&quot;).

man/ipptoolfile.5

@@ -669,6 +669,11 @@ Inserts a single "$" character.
 \fB$ENV[\fIname\fB]\fR
 Inserts the value of the named environment variable, or an empty string if the environment variable is not defined.
 .TP 5
+\fB$basename\fR
+Inserts the base filename (without directory path) of the path provided to
+.BR ipptool (8)
+with the \fI-f\fR option.
+.TP 5
 \fB$date-current\fR
 Inserts the current date and time using the ISO-8601 format ("yyyy-mm-ddThh:mm:ssZ").
 .TP 5

tools/ipptool.c

@@ -267,7 +267,8 @@ main(int  argc,				/* I - Number of command-line args */
 			*value,		/* Pointer to value */
 			filename[1024],	/* Real filename */
 			testname[1024];	/* Real test filename */
-  const char		*ext,		/* Extension on filename */
+  const char		*base,		/* Base filename */
+			*ext,		/* Extension on filename */
 			*testfile;	/* Test file to use */
   int			interval,	/* Test interval in microseconds */
 			repeat;		/* Repeat count */
@@ -528,6 +529,11 @@ main(int  argc,				/* I - Number of command-line args */
 
 	      ippFileSetVar(data->parent, "filename", filename);
 
+	      if ((base = strrchr(filename, '/')) != NULL)
+	        ippFileSetVar(data->parent, "basename", base + 1);
+	      else
+	        ippFileSetVar(data->parent, "basename", filename);
+
               if ((ext = strrchr(filename, '.')) != NULL)
               {
                 // Guess the MIME media type based on the extension...