# HG changeset patch
# User Mychaela Falconia <falcon@freecalypso.org>
# Date 1615707275 0
# Node ID b7ee2e85686b4fefb14a3cf0d9afad25b2292983
# Parent  7c26eac6ab00df1a4ba4cf5e834b3f7bb4fad517
command dispatch and scripting factored out into libcommon

diff -r 7c26eac6ab00 -r b7ee2e85686b libcommon/Makefile
--- a/libcommon/Makefile	Sun Mar 14 07:22:13 2021 +0000
+++ b/libcommon/Makefile	Sun Mar 14 07:34:35 2021 +0000
@@ -1,7 +1,7 @@
 CC=	gcc
 CFLAGS=	-O2
-OBJS=	apdu.o apducmd.o atr.o backend.o be_init.o chkblank.o dumpdirfunc.o \
-	exit.o globalopts.o hexdump.o localcd.o names.o
+OBJS=	apdu.o apducmd.o atr.o backend.o be_init.o chkblank.o dispatch.o \
+	dumpdirfunc.o exit.o globalopts.o hexdump.o localcd.o names.o script.o
 LIB=	libcommon.a
 
 all:	${LIB}
diff -r 7c26eac6ab00 -r b7ee2e85686b libcommon/cmdtab.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libcommon/cmdtab.h	Sun Mar 14 07:34:35 2021 +0000
@@ -0,0 +1,7 @@
+struct cmdtab {
+	char *cmd;
+	int minargs;
+	int maxargs;
+	int allow_redir;
+	int (*func)();
+};
diff -r 7c26eac6ab00 -r b7ee2e85686b libcommon/dispatch.c
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libcommon/dispatch.c	Sun Mar 14 07:34:35 2021 +0000
@@ -0,0 +1,149 @@
+/*
+ * This module implements common command dispatch for our SIM tools.
+ */
+
+#include <ctype.h>
+#include <stdio.h>
+#include <string.h>
+#include <strings.h>
+#include <stdlib.h>
+#include "cmdtab.h"
+
+extern struct cmdtab cmdtab[];
+
+static FILE *
+handle_output_redir(str)
+	char *str;
+{
+	char *cp, *fn;
+	FILE *outf;
+
+	for (cp = str; isspace(*cp); cp++)
+		;
+	if (!*cp || *cp == '#') {
+		fprintf(stderr, "error: no filename after '>'\n");
+		return(0);
+	}
+	for (fn = cp; *cp && !isspace(*cp); cp++)
+		;
+	if (*cp)
+		*cp++ = '\0';
+	while (isspace(*cp))
+		cp++;
+	if (*cp && *cp != '#') {
+		fprintf(stderr, "error: invalid syntax after '>'\n");
+		return(0);
+	}
+	outf = fopen(fn, "w");
+	if (!outf)
+		perror(fn);
+	return outf;
+}
+
+simtool_dispatch_cmd(cmd, is_script)
+	char *cmd;
+{
+	char *argv[20];
+	char *cp, **ap;
+	struct cmdtab *tp;
+	FILE *outf;
+	int rc;
+
+	for (cp = cmd; isspace(*cp); cp++)
+		;
+	if (!*cp || *cp == '#')
+		return(0);
+	if (is_script)
+		printf("Script command: %s\n", cp);
+	if (*cp == '!')
+		return system(cp + 1);
+	argv[0] = cp;
+	while (*cp && !isspace(*cp))
+		cp++;
+	if (*cp)
+		*cp++ = '\0';
+	for (tp = cmdtab; tp->cmd; tp++)
+		if (!strcmp(tp->cmd, argv[0]))
+			break;
+	if (!tp->func) {
+		fprintf(stderr, "error: no such command\n");
+		return(-1);
+	}
+	for (ap = argv + 1; ; ) {
+		while (isspace(*cp))
+			cp++;
+		if (!*cp || *cp == '#' || *cp == '>')
+			break;
+		if (ap - argv - 1 >= tp->maxargs) {
+			fprintf(stderr, "error: too many arguments\n");
+			return(-1);
+		}
+		if (*cp == '"') {
+			*ap++ = ++cp;
+			for (;;) {
+				if (!*cp) {
+unterm_qstring:				fprintf(stderr,
+					"error: unterminated quoted string\n");
+					return(-1);
+				}
+				if (*cp == '"')
+					break;
+				if (*cp++ == '\\') {
+					if (!*cp)
+						goto unterm_qstring;
+					cp++;
+				}
+			}
+			*cp++ = '\0';
+		} else {
+			*ap++ = cp;
+			while (*cp && !isspace(*cp))
+				cp++;
+			if (*cp)
+				*cp++ = '\0';
+		}
+	}
+	if (ap - argv - 1 < tp->minargs) {
+		fprintf(stderr, "error: too few arguments\n");
+		return(-1);
+	}
+	*ap = 0;
+	if (*cp == '>') {
+		if (!tp->allow_redir) {
+			fprintf(stderr,
+			"error: command does not support output redirection\n");
+			return(-1);
+		}
+		outf = handle_output_redir(cp + 1);
+		if (!outf)
+			return(-1);
+	} else
+		outf = stdout;
+	rc = tp->func(ap - argv, argv, outf);
+	if (outf != stdout)
+		fclose(outf);
+	return rc;
+}
+
+dispatch_ready_argv(argc, argv)
+	char **argv;
+{
+	struct cmdtab *tp;
+
+	for (tp = cmdtab; tp->cmd; tp++)
+		if (!strcmp(tp->cmd, argv[0]))
+			break;
+	if (!tp->func) {
+		fprintf(stderr, "error: no such command\n");
+		return(-1);
+	}
+	if (argc - 1 > tp->maxargs) {
+		fprintf(stderr, "error: too many arguments\n");
+		return(-1);
+	}
+	if (argc - 1 < tp->minargs) {
+		fprintf(stderr, "error: too few arguments\n");
+		return(-1);
+	}
+	return tp->func(argc, argv, stdout);
+}
diff -r 7c26eac6ab00 -r b7ee2e85686b libcommon/script.c
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libcommon/script.c	Sun Mar 14 07:34:35 2021 +0000
@@ -0,0 +1,39 @@
+/*
+ * This module implements the exec command, which is our scripting facility.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <strings.h>
+
+extern FILE *open_script_input_file();
+
+cmd_exec(argc, argv)
+	char **argv;
+{
+	FILE *f;
+	char linebuf[512], *cp;
+	int lineno, retval = 0;
+
+	f = open_script_input_file(argv[1]);
+	if (!f) {
+		perror(argv[1]);
+		return(-1);
+	}
+	for (lineno = 1; fgets(linebuf, sizeof linebuf, f); lineno++) {
+		cp = index(linebuf, '\n');
+		if (!cp) {
+			fprintf(stderr, "%s line %d: missing newline\n",
+				argv[1], lineno);
+			fclose(f);
+			return(-1);
+		}
+		*cp = '\0';
+		retval = simtool_dispatch_cmd(linebuf, 1);
+		if (retval)
+			break;
+	}
+	fclose(f);
+	return(retval);
+}
diff -r 7c26eac6ab00 -r b7ee2e85686b simtool/Makefile
--- a/simtool/Makefile	Sun Mar 14 07:22:13 2021 +0000
+++ b/simtool/Makefile	Sun Mar 14 07:34:35 2021 +0000
@@ -2,14 +2,14 @@
 CFLAGS=	-O2
 CPPFLAGS=-I../libcommon
 PROG=	fc-simtool
-OBJS=	a38.o bfsearch.o chv.o chvext.o curfile.o dispatch.o dumpdir.o \
+OBJS=	a38.o bfsearch.o chv.o chvext.o cmdtab.o curfile.o dumpdir.o \
 	erasefile.o fplmn.o getresp.o grcard1.o grcard2.o hlread.o \
 	inval_rehab.o lndwrite.o main.o miscadm.o opldump.o oplprog.o \
 	pbcommon.o pbdump.o pberase.o pbrestore.o pbupd_imm.o pbupd_immhex.o \
 	plmnsel.o pnndump.o pnnprog.o readcmd.o readef.o readops.o restorebin.o\
-	savebin.o script.o select.o sjs1_hacks.o smserase.o smsp_common.o \
-	smsp_dump.o smsp_erase.o smsp_restore.o smsp_set.o sstlist.o sstprog.o \
-	stktest.o telsum.o usersum.o writecmd.o writeops.o
+	savebin.o select.o sjs1_hacks.o smserase.o smsp_common.o smsp_dump.o \
+	smsp_erase.o smsp_restore.o smsp_set.o sstlist.o sstprog.o stktest.o \
+	telsum.o usersum.o writecmd.o writeops.o
 LIBS=	../libcommon/libcommon.a ../libutil/libutil.a
 INSTBIN=/opt/freecalypso/bin
 
diff -r 7c26eac6ab00 -r b7ee2e85686b simtool/cmdtab.c
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/simtool/cmdtab.c	Sun Mar 14 07:34:35 2021 +0000
@@ -0,0 +1,248 @@
+/*
+ * This module contains the command table for fc-simtool.
+ */
+
+#include "cmdtab.h"
+
+extern int cmd_a38();
+extern int cmd_apdu();
+extern int cmd_atr();
+extern int cmd_bfsearch();
+extern int cmd_bfsearch_full();
+extern int cmd_cd();
+extern int cmd_change_chv();
+extern int cmd_disable_chv1();
+extern int cmd_disable_chv1_rpt();
+extern int cmd_enable_chv1();
+extern int cmd_enable_chv1_rpt();
+extern int cmd_envelope();
+extern int cmd_envelope_imm();
+extern int cmd_erase_file();
+extern int cmd_exec();
+extern int cmd_exit();
+extern int cmd_fix_sysmo_msisdn();
+extern int cmd_fplmn_dump();
+extern int cmd_fplmn_erase();
+extern int cmd_fplmn_erase_all();
+extern int cmd_fplmn_write();
+extern int cmd_fplmn_write_list();
+extern int cmd_get_response();
+extern int cmd_grcard1_set_adm();
+extern int cmd_grcard1_set_ki();
+extern int cmd_grcard1_set_pin();
+extern int cmd_grcard2_set_adm5();
+extern int cmd_grcard2_set_adm5_hex();
+extern int cmd_grcard2_set_comp128();
+extern int cmd_grcard2_set_ki();
+extern int cmd_grcard2_set_pin();
+extern int cmd_grcard2_set_puk();
+extern int cmd_grcard2_set_super();
+extern int cmd_grcard2_set_super_hex();
+extern int cmd_iccid();
+extern int cmd_imsi();
+extern int cmd_imsi_raw();
+extern int cmd_inval_adn();
+extern int cmd_lnd_dump();
+extern int cmd_lnd_erase();
+extern int cmd_lnd_restore();
+extern int cmd_lnd_write();
+extern int cmd_opl_dump();
+extern int cmd_opl_erase();
+extern int cmd_opl_write();
+extern int cmd_pb_dump();
+extern int cmd_pb_dump_rec();
+extern int cmd_pb_erase();
+extern int cmd_pb_erase_one();
+extern int cmd_pb_erase_range();
+extern int cmd_pb_restore();
+extern int cmd_pb_update();
+extern int cmd_pb_update_imm();
+extern int cmd_pb_update_imm_hex();
+extern int cmd_plmnsel_dump();
+extern int cmd_plmnsel_erase();
+extern int cmd_plmnsel_erase_all();
+extern int cmd_plmnsel_write();
+extern int cmd_plmnsel_write_list();
+extern int cmd_pnn_dump();
+extern int cmd_pnn_erase();
+extern int cmd_pnn_write();
+extern int cmd_readbin();
+extern int cmd_readef();
+extern int cmd_readrec();
+extern int cmd_rehab_adn();
+extern int cmd_rehab_imsi();
+extern int cmd_rehab_loci();
+extern int cmd_restore_file();
+extern int cmd_savebin();
+extern int cmd_save_sms_bin();
+extern int cmd_select();
+extern int cmd_sim_resp();
+extern int cmd_sms_erase_all();
+extern int cmd_sms_erase_one();
+extern int cmd_sms_erase_range();
+extern int cmd_smsp_dump();
+extern int cmd_smsp_erase_all();
+extern int cmd_smsp_erase_one();
+extern int cmd_smsp_erase_range();
+extern int cmd_smsp_restore();
+extern int cmd_smsp_set();
+extern int cmd_smsp_set_tag();
+extern int cmd_spn();
+extern int cmd_sst();
+extern int cmd_telecom_sum();
+extern int cmd_terminal_profile();
+extern int cmd_uicc_dir();
+extern int cmd_unblock_chv();
+extern int cmd_update_bin();
+extern int cmd_update_bin_imm();
+extern int cmd_update_rec();
+extern int cmd_update_rec_fill();
+extern int cmd_update_rec_imm();
+extern int cmd_user_sum();
+extern int cmd_verify_chv();
+extern int cmd_verify_ext();
+extern int cmd_verify_hex();
+extern int cmd_verify_sjs1_adm1();
+extern int cmd_write_acc();
+extern int cmd_write_iccid();
+extern int cmd_write_iccid_sh18();
+extern int cmd_write_iccid_sh19();
+extern int cmd_write_imsi();
+extern int cmd_write_imsi_sh();
+extern int cmd_write_spn();
+extern int cmd_write_sst();
+
+extern int current_ef_inval();
+extern int current_ef_rehab();
+
+struct cmdtab cmdtab[] = {
+	{"a38", 1, 1, 1, cmd_a38},
+	{"apdu", 1, 1, 0, cmd_apdu},
+	{"atr", 0, 0, 0, cmd_atr},
+	{"bfsearch", 1, 18, 1, cmd_bfsearch},
+	{"bfsearch-full", 0, 0, 1, cmd_bfsearch_full},
+	{"bfsearch-mf", 0, 0, 1, cmd_bfsearch_full},
+	{"cd", 1, 1, 0, cmd_cd},
+	{"change-chv1", 2, 2, 0, cmd_change_chv},
+	{"change-chv2", 2, 2, 0, cmd_change_chv},
+	{"change-pin1", 2, 2, 0, cmd_change_chv},
+	{"change-pin2", 2, 2, 0, cmd_change_chv},
+	{"cur-ef-inval", 0, 0, 0, current_ef_inval},
+	{"cur-ef-rehab", 0, 0, 0, current_ef_rehab},
+	{"disable-chv1", 1, 1, 0, cmd_disable_chv1},
+	{"disable-chv1-rpt", 1, 1, 0, cmd_disable_chv1_rpt},
+	{"disable-pin1", 1, 1, 0, cmd_disable_chv1},
+	{"disable-pin1-rpt", 1, 1, 0, cmd_disable_chv1_rpt},
+	{"enable-chv1", 1, 1, 0, cmd_enable_chv1},
+	{"enable-chv1-rpt", 1, 1, 0, cmd_enable_chv1_rpt},
+	{"enable-pin1", 1, 1, 0, cmd_enable_chv1},
+	{"enable-pin1-rpt", 1, 1, 0, cmd_enable_chv1_rpt},
+	{"envelope", 1, 1, 0, cmd_envelope},
+	{"envelope-imm", 1, 1, 0, cmd_envelope_imm},
+	{"erase-file", 1, 2, 0, cmd_erase_file},
+	{"exec", 1, 1, 0, cmd_exec},
+	{"exit", 0, 1, 0, cmd_exit},
+	{"fix-sysmo-msisdn", 0, 0, 0, cmd_fix_sysmo_msisdn},
+	{"fplmn-dump", 0, 0, 1, cmd_fplmn_dump},
+	{"fplmn-erase", 1, 2, 0, cmd_fplmn_erase},
+	{"fplmn-erase-all", 0, 0, 0, cmd_fplmn_erase_all},
+	{"fplmn-write", 2, 2, 0, cmd_fplmn_write},
+	{"fplmn-write-list", 1, 1, 0, cmd_fplmn_write_list},
+	{"get-response", 1, 1, 1, cmd_get_response},
+	{"grcard1-set-adm1", 2, 2, 0, cmd_grcard1_set_adm},
+	{"grcard1-set-adm2", 2, 2, 0, cmd_grcard1_set_adm},
+	{"grcard1-set-ki", 1, 1, 0, cmd_grcard1_set_ki},
+	{"grcard1-set-pin1", 2, 2, 0, cmd_grcard1_set_pin},
+	{"grcard1-set-pin2", 2, 2, 0, cmd_grcard1_set_pin},
+	{"grcard2-set-adm5", 1, 1, 0, cmd_grcard2_set_adm5},
+	{"grcard2-set-adm5-hex", 1, 1, 0, cmd_grcard2_set_adm5_hex},
+	{"grcard2-set-comp128", 1, 1, 0, cmd_grcard2_set_comp128},
+	{"grcard2-set-ki", 1, 1, 0, cmd_grcard2_set_ki},
+	{"grcard2-set-pin1", 1, 1, 0, cmd_grcard2_set_pin},
+	{"grcard2-set-pin2", 1, 1, 0, cmd_grcard2_set_pin},
+	{"grcard2-set-puk1", 1, 1, 0, cmd_grcard2_set_puk},
+	{"grcard2-set-puk2", 1, 1, 0, cmd_grcard2_set_puk},
+	{"grcard2-set-super", 1, 1, 0, cmd_grcard2_set_super},
+	{"grcard2-set-super-hex", 1, 1, 0, cmd_grcard2_set_super_hex},
+	{"iccid", 0, 0, 1, cmd_iccid},
+	{"imsi", 0, 0, 1, cmd_imsi},
+	{"imsi-raw", 0, 0, 1, cmd_imsi_raw},
+	{"inval-adn", 0, 0, 0, cmd_inval_adn},
+	{"lnd-dump", 0, 0, 1, cmd_lnd_dump},
+	{"lnd-erase", 0, 0, 0, cmd_lnd_erase},
+	{"lnd-restore", 1, 1, 0, cmd_lnd_restore},
+	{"lnd-write", 1, 2, 0, cmd_lnd_write},
+	{"opl-dump", 0, 0, 1, cmd_opl_dump},
+	{"opl-erase", 1, 2, 0, cmd_opl_erase},
+	{"opl-write", 5, 5, 0, cmd_opl_write},
+	{"pb-dump", 1, 1, 1, cmd_pb_dump},
+	{"pb-dump-rec", 2, 3, 1, cmd_pb_dump_rec},
+	{"pb-erase", 1, 1, 0, cmd_pb_erase},
+	{"pb-erase-one", 2, 2, 0, cmd_pb_erase_one},
+	{"pb-erase-range", 3, 3, 0, cmd_pb_erase_range},
+	{"pb-restore", 2, 2, 0, cmd_pb_restore},
+	{"pb-update", 2, 2, 0, cmd_pb_update},
+	{"pb-update-imm", 3, 4, 0, cmd_pb_update_imm},
+	{"pb-update-imm-hex", 4, 4, 0, cmd_pb_update_imm_hex},
+	{"plmnsel-dump", 0, 0, 1, cmd_plmnsel_dump},
+	{"plmnsel-erase", 1, 2, 0, cmd_plmnsel_erase},
+	{"plmnsel-erase-all", 0, 0, 0, cmd_plmnsel_erase_all},
+	{"plmnsel-write", 2, 2, 0, cmd_plmnsel_write},
+	{"plmnsel-write-list", 1, 1, 0, cmd_plmnsel_write_list},
+	{"pnn-dump", 0, 0, 1, cmd_pnn_dump},
+	{"pnn-erase", 1, 2, 0, cmd_pnn_erase},
+	{"pnn-write", 2, 3, 0, cmd_pnn_write},
+	{"quit", 0, 1, 0, cmd_exit},
+	{"readbin", 2, 2, 1, cmd_readbin},
+	{"readef", 1, 1, 1, cmd_readef},
+	{"readrec", 1, 2, 1, cmd_readrec},
+	{"rehab-adn", 0, 0, 0, cmd_rehab_adn},
+	{"rehab-imsi", 0, 0, 0, cmd_rehab_imsi},
+	{"rehab-loci", 0, 0, 0, cmd_rehab_loci},
+	{"restore-file", 2, 2, 0, cmd_restore_file},
+	{"savebin", 2, 2, 0, cmd_savebin},
+	{"save-sms-bin", 1, 1, 0, cmd_save_sms_bin},
+	{"select", 1, 1, 1, cmd_select},
+	{"sim-resp", 0, 0, 1, cmd_sim_resp},
+	{"sms-erase-all", 0, 0, 0, cmd_sms_erase_all},
+	{"sms-erase-one", 1, 1, 0, cmd_sms_erase_one},
+	{"sms-erase-range", 2, 2, 0, cmd_sms_erase_range},
+	{"smsp-dump", 0, 0, 1, cmd_smsp_dump},
+	{"smsp-erase-all", 0, 0, 0, cmd_smsp_erase_all},
+	{"smsp-erase-one", 1, 1, 0, cmd_smsp_erase_one},
+	{"smsp-erase-range", 2, 2, 0, cmd_smsp_erase_range},
+	{"smsp-restore", 1, 1, 0, cmd_smsp_restore},
+	{"smsp-set", 2, 6, 0, cmd_smsp_set},
+	{"smsp-set-tag", 3, 7, 0, cmd_smsp_set_tag},
+	{"spn", 0, 0, 1, cmd_spn},
+	{"sst", 0, 0, 1, cmd_sst},
+	{"telecom-sum", 0, 0, 0, cmd_telecom_sum},
+	{"terminal-profile", 1, 1, 0, cmd_terminal_profile},
+	{"uicc-dir", 0, 0, 1, cmd_uicc_dir},
+	{"unblock-chv1", 2, 2, 0, cmd_unblock_chv},
+	{"unblock-chv2", 2, 2, 0, cmd_unblock_chv},
+	{"unblock-pin1", 2, 2, 0, cmd_unblock_chv},
+	{"unblock-pin2", 2, 2, 0, cmd_unblock_chv},
+	{"update-bin", 2, 2, 0, cmd_update_bin},
+	{"update-bin-imm", 2, 2, 0, cmd_update_bin_imm},
+	{"update-rec", 2, 2, 0, cmd_update_rec},
+	{"update-rec-fill", 2, 2, 0, cmd_update_rec_fill},
+	{"update-rec-imm", 2, 2, 0, cmd_update_rec_imm},
+	{"user-sum", 0, 0, 1, cmd_user_sum},
+	{"verify-chv1", 1, 1, 0, cmd_verify_chv},
+	{"verify-chv2", 1, 1, 0, cmd_verify_chv},
+	{"verify-ext", 2, 2, 0, cmd_verify_ext},
+	{"verify-hex", 2, 2, 0, cmd_verify_hex},
+	{"verify-pin1", 1, 1, 0, cmd_verify_chv},
+	{"verify-pin2", 1, 1, 0, cmd_verify_chv},
+	{"verify-sjs1-adm1", 1, 1, 0, cmd_verify_sjs1_adm1},
+	{"write-acc", 1, 1, 0, cmd_write_acc},
+	{"write-iccid", 1, 1, 0, cmd_write_iccid},
+	{"write-iccid-sh18", 1, 1, 0, cmd_write_iccid_sh18},
+	{"write-iccid-sh19", 1, 1, 0, cmd_write_iccid_sh19},
+	{"write-imsi", 1, 1, 0, cmd_write_imsi},
+	{"write-imsi-sh", 1, 1, 0, cmd_write_imsi_sh},
+	{"write-spn", 2, 2, 0, cmd_write_spn},
+	{"write-sst", 1, 1, 0, cmd_write_sst},
+	{0, 0, 0, 0, 0}
+};
diff -r 7c26eac6ab00 -r b7ee2e85686b simtool/dispatch.c
--- a/simtool/dispatch.c	Sun Mar 14 07:22:13 2021 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,395 +0,0 @@
-/*
- * This module implements the command dispatch for fc-simtool
- */
-
-#include <ctype.h>
-#include <stdio.h>
-#include <string.h>
-#include <strings.h>
-#include <stdlib.h>
-
-extern int cmd_a38();
-extern int cmd_apdu();
-extern int cmd_atr();
-extern int cmd_bfsearch();
-extern int cmd_bfsearch_full();
-extern int cmd_cd();
-extern int cmd_change_chv();
-extern int cmd_disable_chv1();
-extern int cmd_disable_chv1_rpt();
-extern int cmd_enable_chv1();
-extern int cmd_enable_chv1_rpt();
-extern int cmd_envelope();
-extern int cmd_envelope_imm();
-extern int cmd_erase_file();
-extern int cmd_exec();
-extern int cmd_exit();
-extern int cmd_fix_sysmo_msisdn();
-extern int cmd_fplmn_dump();
-extern int cmd_fplmn_erase();
-extern int cmd_fplmn_erase_all();
-extern int cmd_fplmn_write();
-extern int cmd_fplmn_write_list();
-extern int cmd_get_response();
-extern int cmd_grcard1_set_adm();
-extern int cmd_grcard1_set_ki();
-extern int cmd_grcard1_set_pin();
-extern int cmd_grcard2_set_adm5();
-extern int cmd_grcard2_set_adm5_hex();
-extern int cmd_grcard2_set_comp128();
-extern int cmd_grcard2_set_ki();
-extern int cmd_grcard2_set_pin();
-extern int cmd_grcard2_set_puk();
-extern int cmd_grcard2_set_super();
-extern int cmd_grcard2_set_super_hex();
-extern int cmd_iccid();
-extern int cmd_imsi();
-extern int cmd_imsi_raw();
-extern int cmd_inval_adn();
-extern int cmd_lnd_dump();
-extern int cmd_lnd_erase();
-extern int cmd_lnd_restore();
-extern int cmd_lnd_write();
-extern int cmd_opl_dump();
-extern int cmd_opl_erase();
-extern int cmd_opl_write();
-extern int cmd_pb_dump();
-extern int cmd_pb_dump_rec();
-extern int cmd_pb_erase();
-extern int cmd_pb_erase_one();
-extern int cmd_pb_erase_range();
-extern int cmd_pb_restore();
-extern int cmd_pb_update();
-extern int cmd_pb_update_imm();
-extern int cmd_pb_update_imm_hex();
-extern int cmd_plmnsel_dump();
-extern int cmd_plmnsel_erase();
-extern int cmd_plmnsel_erase_all();
-extern int cmd_plmnsel_write();
-extern int cmd_plmnsel_write_list();
-extern int cmd_pnn_dump();
-extern int cmd_pnn_erase();
-extern int cmd_pnn_write();
-extern int cmd_readbin();
-extern int cmd_readef();
-extern int cmd_readrec();
-extern int cmd_rehab_adn();
-extern int cmd_rehab_imsi();
-extern int cmd_rehab_loci();
-extern int cmd_restore_file();
-extern int cmd_savebin();
-extern int cmd_save_sms_bin();
-extern int cmd_select();
-extern int cmd_sim_resp();
-extern int cmd_sms_erase_all();
-extern int cmd_sms_erase_one();
-extern int cmd_sms_erase_range();
-extern int cmd_smsp_dump();
-extern int cmd_smsp_erase_all();
-extern int cmd_smsp_erase_one();
-extern int cmd_smsp_erase_range();
-extern int cmd_smsp_restore();
-extern int cmd_smsp_set();
-extern int cmd_smsp_set_tag();
-extern int cmd_spn();
-extern int cmd_sst();
-extern int cmd_telecom_sum();
-extern int cmd_terminal_profile();
-extern int cmd_uicc_dir();
-extern int cmd_unblock_chv();
-extern int cmd_update_bin();
-extern int cmd_update_bin_imm();
-extern int cmd_update_rec();
-extern int cmd_update_rec_fill();
-extern int cmd_update_rec_imm();
-extern int cmd_user_sum();
-extern int cmd_verify_chv();
-extern int cmd_verify_ext();
-extern int cmd_verify_hex();
-extern int cmd_verify_sjs1_adm1();
-extern int cmd_write_acc();
-extern int cmd_write_iccid();
-extern int cmd_write_iccid_sh18();
-extern int cmd_write_iccid_sh19();
-extern int cmd_write_imsi();
-extern int cmd_write_imsi_sh();
-extern int cmd_write_spn();
-extern int cmd_write_sst();
-
-extern int current_ef_inval();
-extern int current_ef_rehab();
-
-static struct cmdtab {
-	char *cmd;
-	int minargs;
-	int maxargs;
-	int allow_redir;
-	int (*func)();
-} cmdtab[] = {
-	{"a38", 1, 1, 1, cmd_a38},
-	{"apdu", 1, 1, 0, cmd_apdu},
-	{"atr", 0, 0, 0, cmd_atr},
-	{"bfsearch", 1, 18, 1, cmd_bfsearch},
-	{"bfsearch-full", 0, 0, 1, cmd_bfsearch_full},
-	{"bfsearch-mf", 0, 0, 1, cmd_bfsearch_full},
-	{"cd", 1, 1, 0, cmd_cd},
-	{"change-chv1", 2, 2, 0, cmd_change_chv},
-	{"change-chv2", 2, 2, 0, cmd_change_chv},
-	{"change-pin1", 2, 2, 0, cmd_change_chv},
-	{"change-pin2", 2, 2, 0, cmd_change_chv},
-	{"cur-ef-inval", 0, 0, 0, current_ef_inval},
-	{"cur-ef-rehab", 0, 0, 0, current_ef_rehab},
-	{"disable-chv1", 1, 1, 0, cmd_disable_chv1},
-	{"disable-chv1-rpt", 1, 1, 0, cmd_disable_chv1_rpt},
-	{"disable-pin1", 1, 1, 0, cmd_disable_chv1},
-	{"disable-pin1-rpt", 1, 1, 0, cmd_disable_chv1_rpt},
-	{"enable-chv1", 1, 1, 0, cmd_enable_chv1},
-	{"enable-chv1-rpt", 1, 1, 0, cmd_enable_chv1_rpt},
-	{"enable-pin1", 1, 1, 0, cmd_enable_chv1},
-	{"enable-pin1-rpt", 1, 1, 0, cmd_enable_chv1_rpt},
-	{"envelope", 1, 1, 0, cmd_envelope},
-	{"envelope-imm", 1, 1, 0, cmd_envelope_imm},
-	{"erase-file", 1, 2, 0, cmd_erase_file},
-	{"exec", 1, 1, 0, cmd_exec},
-	{"exit", 0, 1, 0, cmd_exit},
-	{"fix-sysmo-msisdn", 0, 0, 0, cmd_fix_sysmo_msisdn},
-	{"fplmn-dump", 0, 0, 1, cmd_fplmn_dump},
-	{"fplmn-erase", 1, 2, 0, cmd_fplmn_erase},
-	{"fplmn-erase-all", 0, 0, 0, cmd_fplmn_erase_all},
-	{"fplmn-write", 2, 2, 0, cmd_fplmn_write},
-	{"fplmn-write-list", 1, 1, 0, cmd_fplmn_write_list},
-	{"get-response", 1, 1, 1, cmd_get_response},
-	{"grcard1-set-adm1", 2, 2, 0, cmd_grcard1_set_adm},
-	{"grcard1-set-adm2", 2, 2, 0, cmd_grcard1_set_adm},
-	{"grcard1-set-ki", 1, 1, 0, cmd_grcard1_set_ki},
-	{"grcard1-set-pin1", 2, 2, 0, cmd_grcard1_set_pin},
-	{"grcard1-set-pin2", 2, 2, 0, cmd_grcard1_set_pin},
-	{"grcard2-set-adm5", 1, 1, 0, cmd_grcard2_set_adm5},
-	{"grcard2-set-adm5-hex", 1, 1, 0, cmd_grcard2_set_adm5_hex},
-	{"grcard2-set-comp128", 1, 1, 0, cmd_grcard2_set_comp128},
-	{"grcard2-set-ki", 1, 1, 0, cmd_grcard2_set_ki},
-	{"grcard2-set-pin1", 1, 1, 0, cmd_grcard2_set_pin},
-	{"grcard2-set-pin2", 1, 1, 0, cmd_grcard2_set_pin},
-	{"grcard2-set-puk1", 1, 1, 0, cmd_grcard2_set_puk},
-	{"grcard2-set-puk2", 1, 1, 0, cmd_grcard2_set_puk},
-	{"grcard2-set-super", 1, 1, 0, cmd_grcard2_set_super},
-	{"grcard2-set-super-hex", 1, 1, 0, cmd_grcard2_set_super_hex},
-	{"iccid", 0, 0, 1, cmd_iccid},
-	{"imsi", 0, 0, 1, cmd_imsi},
-	{"imsi-raw", 0, 0, 1, cmd_imsi_raw},
-	{"inval-adn", 0, 0, 0, cmd_inval_adn},
-	{"lnd-dump", 0, 0, 1, cmd_lnd_dump},
-	{"lnd-erase", 0, 0, 0, cmd_lnd_erase},
-	{"lnd-restore", 1, 1, 0, cmd_lnd_restore},
-	{"lnd-write", 1, 2, 0, cmd_lnd_write},
-	{"opl-dump", 0, 0, 1, cmd_opl_dump},
-	{"opl-erase", 1, 2, 0, cmd_opl_erase},
-	{"opl-write", 5, 5, 0, cmd_opl_write},
-	{"pb-dump", 1, 1, 1, cmd_pb_dump},
-	{"pb-dump-rec", 2, 3, 1, cmd_pb_dump_rec},
-	{"pb-erase", 1, 1, 0, cmd_pb_erase},
-	{"pb-erase-one", 2, 2, 0, cmd_pb_erase_one},
-	{"pb-erase-range", 3, 3, 0, cmd_pb_erase_range},
-	{"pb-restore", 2, 2, 0, cmd_pb_restore},
-	{"pb-update", 2, 2, 0, cmd_pb_update},
-	{"pb-update-imm", 3, 4, 0, cmd_pb_update_imm},
-	{"pb-update-imm-hex", 4, 4, 0, cmd_pb_update_imm_hex},
-	{"plmnsel-dump", 0, 0, 1, cmd_plmnsel_dump},
-	{"plmnsel-erase", 1, 2, 0, cmd_plmnsel_erase},
-	{"plmnsel-erase-all", 0, 0, 0, cmd_plmnsel_erase_all},
-	{"plmnsel-write", 2, 2, 0, cmd_plmnsel_write},
-	{"plmnsel-write-list", 1, 1, 0, cmd_plmnsel_write_list},
-	{"pnn-dump", 0, 0, 1, cmd_pnn_dump},
-	{"pnn-erase", 1, 2, 0, cmd_pnn_erase},
-	{"pnn-write", 2, 3, 0, cmd_pnn_write},
-	{"quit", 0, 1, 0, cmd_exit},
-	{"readbin", 2, 2, 1, cmd_readbin},
-	{"readef", 1, 1, 1, cmd_readef},
-	{"readrec", 1, 2, 1, cmd_readrec},
-	{"rehab-adn", 0, 0, 0, cmd_rehab_adn},
-	{"rehab-imsi", 0, 0, 0, cmd_rehab_imsi},
-	{"rehab-loci", 0, 0, 0, cmd_rehab_loci},
-	{"restore-file", 2, 2, 0, cmd_restore_file},
-	{"savebin", 2, 2, 0, cmd_savebin},
-	{"save-sms-bin", 1, 1, 0, cmd_save_sms_bin},
-	{"select", 1, 1, 1, cmd_select},
-	{"sim-resp", 0, 0, 1, cmd_sim_resp},
-	{"sms-erase-all", 0, 0, 0, cmd_sms_erase_all},
-	{"sms-erase-one", 1, 1, 0, cmd_sms_erase_one},
-	{"sms-erase-range", 2, 2, 0, cmd_sms_erase_range},
-	{"smsp-dump", 0, 0, 1, cmd_smsp_dump},
-	{"smsp-erase-all", 0, 0, 0, cmd_smsp_erase_all},
-	{"smsp-erase-one", 1, 1, 0, cmd_smsp_erase_one},
-	{"smsp-erase-range", 2, 2, 0, cmd_smsp_erase_range},
-	{"smsp-restore", 1, 1, 0, cmd_smsp_restore},
-	{"smsp-set", 2, 6, 0, cmd_smsp_set},
-	{"smsp-set-tag", 3, 7, 0, cmd_smsp_set_tag},
-	{"spn", 0, 0, 1, cmd_spn},
-	{"sst", 0, 0, 1, cmd_sst},
-	{"telecom-sum", 0, 0, 0, cmd_telecom_sum},
-	{"terminal-profile", 1, 1, 0, cmd_terminal_profile},
-	{"uicc-dir", 0, 0, 1, cmd_uicc_dir},
-	{"unblock-chv1", 2, 2, 0, cmd_unblock_chv},
-	{"unblock-chv2", 2, 2, 0, cmd_unblock_chv},
-	{"unblock-pin1", 2, 2, 0, cmd_unblock_chv},
-	{"unblock-pin2", 2, 2, 0, cmd_unblock_chv},
-	{"update-bin", 2, 2, 0, cmd_update_bin},
-	{"update-bin-imm", 2, 2, 0, cmd_update_bin_imm},
-	{"update-rec", 2, 2, 0, cmd_update_rec},
-	{"update-rec-fill", 2, 2, 0, cmd_update_rec_fill},
-	{"update-rec-imm", 2, 2, 0, cmd_update_rec_imm},
-	{"user-sum", 0, 0, 1, cmd_user_sum},
-	{"verify-chv1", 1, 1, 0, cmd_verify_chv},
-	{"verify-chv2", 1, 1, 0, cmd_verify_chv},
-	{"verify-ext", 2, 2, 0, cmd_verify_ext},
-	{"verify-hex", 2, 2, 0, cmd_verify_hex},
-	{"verify-pin1", 1, 1, 0, cmd_verify_chv},
-	{"verify-pin2", 1, 1, 0, cmd_verify_chv},
-	{"verify-sjs1-adm1", 1, 1, 0, cmd_verify_sjs1_adm1},
-	{"write-acc", 1, 1, 0, cmd_write_acc},
-	{"write-iccid", 1, 1, 0, cmd_write_iccid},
-	{"write-iccid-sh18", 1, 1, 0, cmd_write_iccid_sh18},
-	{"write-iccid-sh19", 1, 1, 0, cmd_write_iccid_sh19},
-	{"write-imsi", 1, 1, 0, cmd_write_imsi},
-	{"write-imsi-sh", 1, 1, 0, cmd_write_imsi_sh},
-	{"write-spn", 2, 2, 0, cmd_write_spn},
-	{"write-sst", 1, 1, 0, cmd_write_sst},
-	{0, 0, 0, 0, 0}
-};
-
-static FILE *
-handle_output_redir(str)
-	char *str;
-{
-	char *cp, *fn;
-	FILE *outf;
-
-	for (cp = str; isspace(*cp); cp++)
-		;
-	if (!*cp || *cp == '#') {
-		fprintf(stderr, "error: no filename after '>'\n");
-		return(0);
-	}
-	for (fn = cp; *cp && !isspace(*cp); cp++)
-		;
-	if (*cp)
-		*cp++ = '\0';
-	while (isspace(*cp))
-		cp++;
-	if (*cp && *cp != '#') {
-		fprintf(stderr, "error: invalid syntax after '>'\n");
-		return(0);
-	}
-	outf = fopen(fn, "w");
-	if (!outf)
-		perror(fn);
-	return outf;
-}
-
-simtool_dispatch_cmd(cmd, is_script)
-	char *cmd;
-{
-	char *argv[20];
-	char *cp, **ap;
-	struct cmdtab *tp;
-	FILE *outf;
-	int rc;
-
-	for (cp = cmd; isspace(*cp); cp++)
-		;
-	if (!*cp || *cp == '#')
-		return(0);
-	if (is_script)
-		printf("Script command: %s\n", cp);
-	if (*cp == '!')
-		return system(cp + 1);
-	argv[0] = cp;
-	while (*cp && !isspace(*cp))
-		cp++;
-	if (*cp)
-		*cp++ = '\0';
-	for (tp = cmdtab; tp->cmd; tp++)
-		if (!strcmp(tp->cmd, argv[0]))
-			break;
-	if (!tp->func) {
-		fprintf(stderr, "error: no such command\n");
-		return(-1);
-	}
-	for (ap = argv + 1; ; ) {
-		while (isspace(*cp))
-			cp++;
-		if (!*cp || *cp == '#' || *cp == '>')
-			break;
-		if (ap - argv - 1 >= tp->maxargs) {
-			fprintf(stderr, "error: too many arguments\n");
-			return(-1);
-		}
-		if (*cp == '"') {
-			*ap++ = ++cp;
-			for (;;) {
-				if (!*cp) {
-unterm_qstring:				fprintf(stderr,
-					"error: unterminated quoted string\n");
-					return(-1);
-				}
-				if (*cp == '"')
-					break;
-				if (*cp++ == '\\') {
-					if (!*cp)
-						goto unterm_qstring;
-					cp++;
-				}
-			}
-			*cp++ = '\0';
-		} else {
-			*ap++ = cp;
-			while (*cp && !isspace(*cp))
-				cp++;
-			if (*cp)
-				*cp++ = '\0';
-		}
-	}
-	if (ap - argv - 1 < tp->minargs) {
-		fprintf(stderr, "error: too few arguments\n");
-		return(-1);
-	}
-	*ap = 0;
-	if (*cp == '>') {
-		if (!tp->allow_redir) {
-			fprintf(stderr,
-			"error: command does not support output redirection\n");
-			return(-1);
-		}
-		outf = handle_output_redir(cp + 1);
-		if (!outf)
-			return(-1);
-	} else
-		outf = stdout;
-	rc = tp->func(ap - argv, argv, outf);
-	if (outf != stdout)
-		fclose(outf);
-	return rc;
-}
-
-dispatch_ready_argv(argc, argv)
-	char **argv;
-{
-	struct cmdtab *tp;
-
-	for (tp = cmdtab; tp->cmd; tp++)
-		if (!strcmp(tp->cmd, argv[0]))
-			break;
-	if (!tp->func) {
-		fprintf(stderr, "error: no such command\n");
-		return(-1);
-	}
-	if (argc - 1 > tp->maxargs) {
-		fprintf(stderr, "error: too many arguments\n");
-		return(-1);
-	}
-	if (argc - 1 < tp->minargs) {
-		fprintf(stderr, "error: too few arguments\n");
-		return(-1);
-	}
-	return tp->func(argc, argv, stdout);
-}
diff -r 7c26eac6ab00 -r b7ee2e85686b simtool/script.c
--- a/simtool/script.c	Sun Mar 14 07:22:13 2021 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-/*
- * This module implements the exec command, which is our scripting facility.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <strings.h>
-
-extern FILE *open_script_input_file();
-
-cmd_exec(argc, argv)
-	char **argv;
-{
-	FILE *f;
-	char linebuf[512], *cp;
-	int lineno, retval = 0;
-
-	f = open_script_input_file(argv[1]);
-	if (!f) {
-		perror(argv[1]);
-		return(-1);
-	}
-	for (lineno = 1; fgets(linebuf, sizeof linebuf, f); lineno++) {
-		cp = index(linebuf, '\n');
-		if (!cp) {
-			fprintf(stderr, "%s line %d: missing newline\n",
-				argv[1], lineno);
-			fclose(f);
-			return(-1);
-		}
-		*cp = '\0';
-		retval = simtool_dispatch_cmd(linebuf, 1);
-		if (retval)
-			break;
-	}
-	fclose(f);
-	return(retval);
-}