Widespread cleanup - moved $conf, $death into $S; $S is given as arg to init_x() and body_x(); $request removed in favor of $_REQUEST; query() replaces $S[pdo]->query(); etc.

1 files changed, 6 insertions, 2 deletions

diff --git a/lib/bkisofs-cli.c b/lib/bkisofs-cli.c
index ee0a3a4..201d57d 100644
--- a/lib/bkisofs-cli.c
+++ b/lib/bkisofs-cli.c
@@ -26,8 +26,8 @@ int main( int argv, char** argc)
 	 * the functions were successful or not */
 	int rc;
 
-	if(argv < 5) {
-		puts("Usage: ingenue-bkisofs <in.iso> <out.iso> <action1> <arg1> [<arg2>] [<action2> <arg2> [etc.]]\nValid actions:\n\tadd <path> <source>\n\treplace <path> <source>\n\tdelete <path>\n\textract <path> <destination>\n\tprint\n\twrite <filename>");
+	if(argv < 3) {
+		puts("Usage: ingenue-bkisofs <in.iso> <action1> <arg1> [<arg2>] [<action2> <arg2> [etc.]]\nValid actions:\n\tadd <path> <source>\n\treplace <path> <source>\n\tdelete <path>\n\tvolname <name>\n\tpublisher <name>\n\textract <path> <destination>\n\tprint\n\twrite <filename>");
 		exit(1);
 	}
 
@@ -95,6 +95,10 @@ int main( int argv, char** argc)
 				rc = bk_extract_as(&volInfo, argc[i+1], argc[i+2][0]?argc[i+2]:"/", slash+1, true, NULL);
 			}
 			i+=2;
+		} else if (strcmp(argc[i], "volname") == 0) {
+			rc=bk_set_vol_name(&volInfo, argc[i++]);
+		} else if (strcmp(argc[i], "publisher") == 0) {
+			rc=bk_set_publisher(&volInfo, argc[i++]);
 		}
 		if (rc <= 0)
 			fatalError(bk_get_error_string(rc));