# HG changeset patch
# User Mychaela Falconia <falcon@freecalypso.org>
# Date 1614654229 0
# Node ID 4d747b86da00d8fca5a52cb88f425f6f64aa3687
# Parent  13b8d90eb5c7727925edefcc6a2a6a91f5ee3807
simtool code: readef command implementation split off

diff -r 13b8d90eb5c7 -r 4d747b86da00 simtool/Makefile
--- a/simtool/Makefile	Mon Mar 01 00:25:49 2021 +0000
+++ b/simtool/Makefile	Tue Mar 02 03:03:49 2021 +0000
@@ -4,10 +4,10 @@
 OBJS=	a38.o bfsearch.o chv.o chvext.o curfile.o dispatch.o dumpdir.o fplmn.o \
 	getresp.o grcard1.o grcard2.o hlread.o inval_rehab.o lndwrite.o main.o \
 	miscadm.o opldump.o pbcommon.o pbdump.o pberase.o pbrestore.o \
-	pbupd_imm.o pbupd_immhex.o plmnsel.o pnndump.o readcmd.o readops.o \
-	restorebin.o savebin.o script.o select.o smserase.o smsp_common.o \
-	smsp_dump.o smsp_erase.o smsp_restore.o smsp_set.o sstlist.o stktest.o \
-	sysmo.o telsum.o usersum.o writecmd.o writeops.o
+	pbupd_imm.o pbupd_immhex.o plmnsel.o pnndump.o readcmd.o readef.o \
+	readops.o restorebin.o savebin.o script.o select.o smserase.o \
+	smsp_common.o smsp_dump.o smsp_erase.o smsp_restore.o smsp_set.o \
+	sstlist.o stktest.o sysmo.o telsum.o usersum.o writecmd.o writeops.o
 LIBS=	../libcommon/libcommon.a ../libutil/libutil.a
 INSTBIN=/opt/freecalypso/bin
 
diff -r 13b8d90eb5c7 -r 4d747b86da00 simtool/readcmd.c
--- a/simtool/readcmd.c	Mon Mar 01 00:25:49 2021 +0000
+++ b/simtool/readcmd.c	Tue Mar 02 03:03:49 2021 +0000
@@ -1,5 +1,8 @@
+/*
+ * This module implements elementary low-level readbin and readrec commands.
+ */
+
 #include <sys/types.h>
-#include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include "simresp.h"
@@ -63,52 +66,3 @@
 	display_sim_resp_in_hex(outf);
 	return(0);
 }
-
-cmd_readef(argc, argv, outf)
-	char **argv;
-	FILE *outf;
-{
-	int file_id, rc;
-	unsigned readlen;
-
-	if (isxdigit(argv[1][0]) && isxdigit(argv[1][1]) &&
-	    isxdigit(argv[1][2]) && isxdigit(argv[1][3]) && !argv[1][4])
-		file_id = strtoul(argv[1], 0, 16);
-	else
-		file_id = find_symbolic_file_name(argv[1]);
-	if (file_id < 0) {
-		fprintf(stderr,
-"error: file ID argument is not a hex value or a recognized symbolic name\n");
-		return(-1);
-	}
-	rc = select_op(file_id);
-	if (rc < 0)
-		return(rc);
-	rc = parse_ef_select_response();
-	if (rc < 0)
-		return(rc);
-	if (curfile_structure != 0x00) {
-		fprintf(stderr,
-			"error: readef command is only for transparent EFs\n");
-		return(-1);
-	}
-	if (outf == stdout) {
-		printf("Transparent EF of %u byte(s)\n", curfile_total_size);
-		printf("File status: %02X\n", sim_resp_data[11]);
-		show_access_conditions("UPDATE", sim_resp_data[8] & 0xF);
-		show_access_conditions("READ & SEEK", sim_resp_data[8] >> 4);
-		show_access_conditions("INCREASE", sim_resp_data[9] >> 4);
-		show_access_conditions("INVALIDATE", sim_resp_data[10] & 0xF);
-		show_access_conditions("REHABILITATE", sim_resp_data[10] >> 4);
-	}
-	if (!curfile_total_size)
-		return(0);
-	readlen = curfile_total_size;
-	if (readlen > 256)
-		readlen = 256;
-	rc = readbin_op(0, readlen);
-	if (rc < 0)
-		return(rc);
-	display_sim_resp_in_hex(outf);
-	return(0);
-}
diff -r 13b8d90eb5c7 -r 4d747b86da00 simtool/readef.c
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/simtool/readef.c	Tue Mar 02 03:03:49 2021 +0000
@@ -0,0 +1,60 @@
+/*
+ * This module implements the readef command for dumping the complete
+ * content of SIM files.
+ */
+
+#include <sys/types.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include "simresp.h"
+#include "curfile.h"
+
+cmd_readef(argc, argv, outf)
+	char **argv;
+	FILE *outf;
+{
+	int file_id, rc;
+	unsigned readlen;
+
+	if (isxdigit(argv[1][0]) && isxdigit(argv[1][1]) &&
+	    isxdigit(argv[1][2]) && isxdigit(argv[1][3]) && !argv[1][4])
+		file_id = strtoul(argv[1], 0, 16);
+	else
+		file_id = find_symbolic_file_name(argv[1]);
+	if (file_id < 0) {
+		fprintf(stderr,
+"error: file ID argument is not a hex value or a recognized symbolic name\n");
+		return(-1);
+	}
+	rc = select_op(file_id);
+	if (rc < 0)
+		return(rc);
+	rc = parse_ef_select_response();
+	if (rc < 0)
+		return(rc);
+	if (curfile_structure != 0x00) {
+		fprintf(stderr,
+			"error: readef command is only for transparent EFs\n");
+		return(-1);
+	}
+	if (outf == stdout) {
+		printf("Transparent EF of %u byte(s)\n", curfile_total_size);
+		printf("File status: %02X\n", sim_resp_data[11]);
+		show_access_conditions("UPDATE", sim_resp_data[8] & 0xF);
+		show_access_conditions("READ & SEEK", sim_resp_data[8] >> 4);
+		show_access_conditions("INCREASE", sim_resp_data[9] >> 4);
+		show_access_conditions("INVALIDATE", sim_resp_data[10] & 0xF);
+		show_access_conditions("REHABILITATE", sim_resp_data[10] >> 4);
+	}
+	if (!curfile_total_size)
+		return(0);
+	readlen = curfile_total_size;
+	if (readlen > 256)
+		readlen = 256;
+	rc = readbin_op(0, readlen);
+	if (rc < 0)
+		return(rc);
+	display_sim_resp_in_hex(outf);
+	return(0);
+}