sidinfo: sidinfo.c annotate

annotate sidinfo.c @ 156:717d143612e2

Simplify things by having separate PRS/PRI macros for printing string and integer fields. Also prepare for iconv support.

author	Matti Hamalainen <ccr@tnsp.org>
date	Thu, 26 Oct 2017 01:45:02 +0300
parents	de75385f75e2
children	8fc887cb56d0

rev	line source
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	1 /*
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	2 * SIDInfo - PSID/RSID information displayer
108 d621e8b59a1c UTF-8. Matti Hamalainen <ccr@tnsp.org> parents: 107 diff changeset	3 * Written by Matti 'ccr' Hämäläinen <ccr@tnsp.org>
131 c2d2369feadc Bump copyrights. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	4 * (C) Copyright 2014-2017 Tecnic Software productions (TNSP)
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	5 */
0 8e7e08bf7b9e Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	6 #include "th_args.h"
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	7 #include "th_string.h"
89 d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	8 #include "th_file.h"
70 4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	9 #include "sidlib.h"
135 b4b1aac8761c Add preprocessor guards around iconv stuff. Matti Hamalainen <ccr@tnsp.org> parents: 134 diff changeset	10 #ifdef HAVE_ICONV
120 ecbc8cabd6a2 Initial work on iconv support. Matti Hamalainen <ccr@tnsp.org> parents: 118 diff changeset	11 #include <iconv.h>
135 b4b1aac8761c Add preprocessor guards around iconv stuff. Matti Hamalainen <ccr@tnsp.org> parents: 134 diff changeset	12 #endif
70 4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	13
0 8e7e08bf7b9e Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	14
28 6240788fe172 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	15 // Some constants
144 6418286a7e4c Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 143 diff changeset	16 #define SET_DEF_CHARSET "utf-8"
89 d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	17 #define SET_SLDB_FILENAME "Songlengths.txt"
1 25a3a142e909 Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	18
121 a2c2c63311de Change in th_args API. Matti Hamalainen <ccr@tnsp.org> parents: 120 diff changeset	19
112 55d99dc7c35c Prepare for some possible future enhancements by specifying a type for each data field. Matti Hamalainen <ccr@tnsp.org> parents: 111 diff changeset	20 enum
55d99dc7c35c Prepare for some possible future enhancements by specifying a type for each data field. Matti Hamalainen <ccr@tnsp.org> parents: 111 diff changeset	21 {
147 f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	22 OFMT_FORMAT = 0x0002,
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	23 };
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	24
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	25
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	26 enum
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	27 {
112 55d99dc7c35c Prepare for some possible future enhancements by specifying a type for each data field. Matti Hamalainen <ccr@tnsp.org> parents: 111 diff changeset	28 OTYPE_OTHER = 0,
55d99dc7c35c Prepare for some possible future enhancements by specifying a type for each data field. Matti Hamalainen <ccr@tnsp.org> parents: 111 diff changeset	29 OTYPE_STR = 1,
55d99dc7c35c Prepare for some possible future enhancements by specifying a type for each data field. Matti Hamalainen <ccr@tnsp.org> parents: 111 diff changeset	30 OTYPE_INT = 2,
55d99dc7c35c Prepare for some possible future enhancements by specifying a type for each data field. Matti Hamalainen <ccr@tnsp.org> parents: 111 diff changeset	31 };
55d99dc7c35c Prepare for some possible future enhancements by specifying a type for each data field. Matti Hamalainen <ccr@tnsp.org> parents: 111 diff changeset	32
0 8e7e08bf7b9e Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	33
8e7e08bf7b9e Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	34 typedef struct
8e7e08bf7b9e Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	35 {
63 6bbe11ae6bf5 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	36 int cmd;
6bbe11ae6bf5 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	37 char *str;
6bbe11ae6bf5 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	38 char chr;
109 59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	39 int flags;
147 f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	40 char *fmt;
63 6bbe11ae6bf5 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	41 } PSFStackItem;
6bbe11ae6bf5 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	42
6bbe11ae6bf5 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	43
6bbe11ae6bf5 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	44 typedef struct
6bbe11ae6bf5 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	45 {
6bbe11ae6bf5 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	46 int nitems, nallocated;
6bbe11ae6bf5 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	47 PSFStackItem *items;
6bbe11ae6bf5 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	48 } PSFStack;
6bbe11ae6bf5 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	49
6bbe11ae6bf5 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	50
6bbe11ae6bf5 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	51 typedef struct
6bbe11ae6bf5 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	52 {
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	53 char *name;
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	54 char *lname;
112 55d99dc7c35c Prepare for some possible future enhancements by specifying a type for each data field. Matti Hamalainen <ccr@tnsp.org> parents: 111 diff changeset	55 int type;
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	56 } PSFOption;
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	57
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	58
109 59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	59 static const PSFOption optPSOptions[] =
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	60 {
112 55d99dc7c35c Prepare for some possible future enhancements by specifying a type for each data field. Matti Hamalainen <ccr@tnsp.org> parents: 111 diff changeset	61 { "Filename" , NULL , OTYPE_STR },
55d99dc7c35c Prepare for some possible future enhancements by specifying a type for each data field. Matti Hamalainen <ccr@tnsp.org> parents: 111 diff changeset	62 { "Type" , NULL , OTYPE_STR },
55d99dc7c35c Prepare for some possible future enhancements by specifying a type for each data field. Matti Hamalainen <ccr@tnsp.org> parents: 111 diff changeset	63 { "Version" , NULL , OTYPE_STR },
55d99dc7c35c Prepare for some possible future enhancements by specifying a type for each data field. Matti Hamalainen <ccr@tnsp.org> parents: 111 diff changeset	64 { "PlayerType" , "Player type" , OTYPE_STR },
55d99dc7c35c Prepare for some possible future enhancements by specifying a type for each data field. Matti Hamalainen <ccr@tnsp.org> parents: 111 diff changeset	65 { "PlayerCompat" , "Player compatibility" , OTYPE_STR },
55d99dc7c35c Prepare for some possible future enhancements by specifying a type for each data field. Matti Hamalainen <ccr@tnsp.org> parents: 111 diff changeset	66 { "VideoClock" , "Video clock speed" , OTYPE_STR },
55d99dc7c35c Prepare for some possible future enhancements by specifying a type for each data field. Matti Hamalainen <ccr@tnsp.org> parents: 111 diff changeset	67 { "SIDModel" , "SID model" , OTYPE_STR },
55 54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	68
112 55d99dc7c35c Prepare for some possible future enhancements by specifying a type for each data field. Matti Hamalainen <ccr@tnsp.org> parents: 111 diff changeset	69 { "DataOffs" , "Data offset" , OTYPE_INT },
55d99dc7c35c Prepare for some possible future enhancements by specifying a type for each data field. Matti Hamalainen <ccr@tnsp.org> parents: 111 diff changeset	70 { "DataSize" , "Data size" , OTYPE_INT },
55d99dc7c35c Prepare for some possible future enhancements by specifying a type for each data field. Matti Hamalainen <ccr@tnsp.org> parents: 111 diff changeset	71 { "LoadAddr" , "Load address" , OTYPE_INT },
55d99dc7c35c Prepare for some possible future enhancements by specifying a type for each data field. Matti Hamalainen <ccr@tnsp.org> parents: 111 diff changeset	72 { "InitAddr" , "Init address" , OTYPE_INT },
55d99dc7c35c Prepare for some possible future enhancements by specifying a type for each data field. Matti Hamalainen <ccr@tnsp.org> parents: 111 diff changeset	73 { "PlayAddr" , "Play address" , OTYPE_INT },
55d99dc7c35c Prepare for some possible future enhancements by specifying a type for each data field. Matti Hamalainen <ccr@tnsp.org> parents: 111 diff changeset	74 { "Songs" , "Songs" , OTYPE_INT },
55d99dc7c35c Prepare for some possible future enhancements by specifying a type for each data field. Matti Hamalainen <ccr@tnsp.org> parents: 111 diff changeset	75 { "StartSong" , "Start song" , OTYPE_INT },
28 6240788fe172 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	76
134 b9a3f93f69d1 Implement support for showing second and third SID chip addresses and models for PSID/RSID v3/v4 files. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	77 { "SID2Model" , "2nd SID model" , OTYPE_INT },
b9a3f93f69d1 Implement support for showing second and third SID chip addresses and models for PSID/RSID v3/v4 files. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	78 { "SID3Model" , "3rd SID model" , OTYPE_INT },
b9a3f93f69d1 Implement support for showing second and third SID chip addresses and models for PSID/RSID v3/v4 files. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	79 { "SID2Addr" , "2nd SID address" , OTYPE_INT },
b9a3f93f69d1 Implement support for showing second and third SID chip addresses and models for PSID/RSID v3/v4 files. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	80 { "SID3Addr" , "3rd SID address" , OTYPE_INT },
b9a3f93f69d1 Implement support for showing second and third SID chip addresses and models for PSID/RSID v3/v4 files. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	81
112 55d99dc7c35c Prepare for some possible future enhancements by specifying a type for each data field. Matti Hamalainen <ccr@tnsp.org> parents: 111 diff changeset	82 { "Name" , NULL , OTYPE_STR },
55d99dc7c35c Prepare for some possible future enhancements by specifying a type for each data field. Matti Hamalainen <ccr@tnsp.org> parents: 111 diff changeset	83 { "Author" , NULL , OTYPE_STR },
55d99dc7c35c Prepare for some possible future enhancements by specifying a type for each data field. Matti Hamalainen <ccr@tnsp.org> parents: 111 diff changeset	84 { "Copyright" , NULL , OTYPE_STR },
150 0288c4d138f7 Make the hash field also formattable. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	85 { "Hash" , NULL , OTYPE_STR },
112 55d99dc7c35c Prepare for some possible future enhancements by specifying a type for each data field. Matti Hamalainen <ccr@tnsp.org> parents: 111 diff changeset	86
55d99dc7c35c Prepare for some possible future enhancements by specifying a type for each data field. Matti Hamalainen <ccr@tnsp.org> parents: 111 diff changeset	87 { "Songlengths" , "Song lengths" , OTYPE_OTHER },
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	88 };
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	89
109 59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	90 static const int noptPSOptions = sizeof(optPSOptions) / sizeof(optPSOptions[0]);
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	91
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	92
28 6240788fe172 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	93 // Option variables
89 d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	94 char *setHVSCPath = NULL,
d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	95 *setSLDBPath = NULL;
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	96 BOOL optParsable = FALSE,
7 36c43f085b28 Add NoPrefix option -n. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	97 optNoNamePrefix = FALSE,
29 d4ec69beb160 Add one line output format. Matti Hamalainen <ccr@tnsp.org> parents: 28 diff changeset	98 optHexadecimal = FALSE,
109 59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	99 optOneLine = FALSE,
111 c7ecf56d23e7 Rename a variable. Matti Hamalainen <ccr@tnsp.org> parents: 110 diff changeset	100 optFieldOutput = TRUE;
55 54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	101 char *optFieldSep = NULL;
19 16cfbdf20eaf Handle multiple files. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	102 int optNFiles = 0;
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	103
59 718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	104 PSFStack optFormat;
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	105
89 d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	106 SIDLibSLDB *sidSLDB = NULL;
d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	107
135 b4b1aac8761c Add preprocessor guards around iconv stuff. Matti Hamalainen <ccr@tnsp.org> parents: 134 diff changeset	108 #ifdef HAVE_ICONV
120 ecbc8cabd6a2 Initial work on iconv support. Matti Hamalainen <ccr@tnsp.org> parents: 118 diff changeset	109 BOOL setUseChConv;
ecbc8cabd6a2 Initial work on iconv support. Matti Hamalainen <ccr@tnsp.org> parents: 118 diff changeset	110 iconv_t setChConv;
135 b4b1aac8761c Add preprocessor guards around iconv stuff. Matti Hamalainen <ccr@tnsp.org> parents: 134 diff changeset	111 #endif
120 ecbc8cabd6a2 Initial work on iconv support. Matti Hamalainen <ccr@tnsp.org> parents: 118 diff changeset	112
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	113
28 6240788fe172 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	114 // Define option arguments
121 a2c2c63311de Change in th_args API. Matti Hamalainen <ccr@tnsp.org> parents: 120 diff changeset	115 static const th_optarg optList[] =
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	116 {
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	117 { 0, '?', "help", "Show this help", OPT_NONE },
24 16d6b5029543 Disable verbose option for now, it does not do anything at the moment. Matti Hamalainen <ccr@tnsp.org> parents: 23 diff changeset	118 // { 1, 'v', "verbose", "Be more verbose", OPT_NONE },
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	119 { 2, 'p', "parsable", "Output in script-parsable format", OPT_NONE },
7 36c43f085b28 Add NoPrefix option -n. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	120 { 5, 'n', "noprefix", "Output without field name prefix", OPT_NONE },
33 39d9df17c8b1 Add field separator argument to -l option. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	121 { 6, 'l', "line", "Output in one line format, -l <field separator>", OPT_ARGREQ },
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	122 { 3, 'f', "fields", "Show only specified field(s)", OPT_ARGREQ },
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	123 { 4, 'x', "hex", "Use hexadecimal values", OPT_NONE },
59 718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	124 { 7, 'F', "format", "Use given format string (see below)", OPT_ARGREQ },
89 d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	125 { 8, 'H', "hvsc", "Specify path to HVSC documents directory", OPT_ARGREQ },
d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	126 { 9, 'S', "sldb", "Specify Songlengths.txt file (use -H if possible)", OPT_ARGREQ },
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	127 };
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	128
44 7b137e4e817c Fix to match the changes in th_args API. Matti Hamalainen <ccr@tnsp.org> parents: 41 diff changeset	129 static const int optListN = sizeof(optList) / sizeof(optList[0]);
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	130
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	131
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	132 void argShowHelp(void)
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	133 {
75 92a4065c41d0 Improve listing of available fields in --help. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	134 int index, len;
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	135
20 6058339ffe0e Update usage. Matti Hamalainen <ccr@tnsp.org> parents: 19 diff changeset	136 th_print_banner(stdout, th_prog_name, "[options] <sid filename> [sid filename #2 ..]");
44 7b137e4e817c Fix to match the changes in th_args API. Matti Hamalainen <ccr@tnsp.org> parents: 41 diff changeset	137 th_args_help(stdout, optList, optListN, 0);
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	138 printf(
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	139 "\n"
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	140 "Available fields:\n");
3 dbe35d78e621 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	141
109 59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	142 for (len = index = 0; index < noptPSOptions; index++)
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	143 {
109 59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	144 const PSFOption *opt = &optPSOptions[index];
75 92a4065c41d0 Improve listing of available fields in --help. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	145 len += strlen(opt->name) + 3;
92a4065c41d0 Improve listing of available fields in --help. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	146 if (len >= 72)
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	147 {
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	148 printf("\n");
75 92a4065c41d0 Improve listing of available fields in --help. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	149 len = 0;
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	150 }
109 59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	151 printf("%s%s", opt->name, (index < noptPSOptions - 1) ? ", " : "\n\n");
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	152 }
58 5ea07110f0cf Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 57 diff changeset	153
59 718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	154 printf(
61 6916aaeda941 Improve help. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	155 "Example: %s -x -p -f hash,copyright somesidfile.sid\n"
6916aaeda941 Improve help. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	156 "\n"
6916aaeda941 Improve help. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	157 "Format strings for '-F' option are composed of @fields@ that\n"
6916aaeda941 Improve help. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	158 "are expanded to their value. Also, escape sequences \\r, \\n and \\t\n"
6916aaeda941 Improve help. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	159 "can be used: -F \"hash=@hash@\\ncopy=@copyright@\\n\"\n"
89 d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	160 "\n"
147 f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	161 "The -F fields can be further formatted via printf-style specifiers:\n"
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	162 "-F \"@copyright:'%%-30s'@\"\n"
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	163 "\n"
89 d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	164 "When specifying HVSC path, it is preferable to use -H/--hvsc option,\n"
d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	165 "as STIL.txt and Songlengths.txt will be automatically used from there.\n"
61 6916aaeda941 Improve help. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	166 , th_prog_name);
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	167 }
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	168
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	169
78 9fb70b7b34ff Clean up error handling for field parsing. Matti Hamalainen <ccr@tnsp.org> parents: 75 diff changeset	170 int argMatchPSField(const char *field)
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	171 {
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	172 int index, found = -1;
109 59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	173 for (index = 0; index < noptPSOptions; index++)
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	174 {
109 59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	175 const PSFOption *opt = &optPSOptions[index];
78 9fb70b7b34ff Clean up error handling for field parsing. Matti Hamalainen <ccr@tnsp.org> parents: 75 diff changeset	176 if (th_strcasecmp(opt->name, field) == 0)
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	177 {
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	178 if (found >= 0)
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	179 return -2;
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	180 found = index;
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	181 }
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	182 }
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	183
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	184 return found;
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	185 }
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	186
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	187
78 9fb70b7b34ff Clean up error handling for field parsing. Matti Hamalainen <ccr@tnsp.org> parents: 75 diff changeset	188 int argMatchPSFieldError(const char *field)
9fb70b7b34ff Clean up error handling for field parsing. Matti Hamalainen <ccr@tnsp.org> parents: 75 diff changeset	189 {
9fb70b7b34ff Clean up error handling for field parsing. Matti Hamalainen <ccr@tnsp.org> parents: 75 diff changeset	190 int found = argMatchPSField(field);
9fb70b7b34ff Clean up error handling for field parsing. Matti Hamalainen <ccr@tnsp.org> parents: 75 diff changeset	191 switch (found)
9fb70b7b34ff Clean up error handling for field parsing. Matti Hamalainen <ccr@tnsp.org> parents: 75 diff changeset	192 {
9fb70b7b34ff Clean up error handling for field parsing. Matti Hamalainen <ccr@tnsp.org> parents: 75 diff changeset	193 case -1:
9fb70b7b34ff Clean up error handling for field parsing. Matti Hamalainen <ccr@tnsp.org> parents: 75 diff changeset	194 THERR("No such field '%s'.\n", field);
9fb70b7b34ff Clean up error handling for field parsing. Matti Hamalainen <ccr@tnsp.org> parents: 75 diff changeset	195 break;
9fb70b7b34ff Clean up error handling for field parsing. Matti Hamalainen <ccr@tnsp.org> parents: 75 diff changeset	196
9fb70b7b34ff Clean up error handling for field parsing. Matti Hamalainen <ccr@tnsp.org> parents: 75 diff changeset	197 case -2:
9fb70b7b34ff Clean up error handling for field parsing. Matti Hamalainen <ccr@tnsp.org> parents: 75 diff changeset	198 THERR("Field '%s' is ambiguous.\n", field);
9fb70b7b34ff Clean up error handling for field parsing. Matti Hamalainen <ccr@tnsp.org> parents: 75 diff changeset	199 break;
9fb70b7b34ff Clean up error handling for field parsing. Matti Hamalainen <ccr@tnsp.org> parents: 75 diff changeset	200 }
9fb70b7b34ff Clean up error handling for field parsing. Matti Hamalainen <ccr@tnsp.org> parents: 75 diff changeset	201 return found;
9fb70b7b34ff Clean up error handling for field parsing. Matti Hamalainen <ccr@tnsp.org> parents: 75 diff changeset	202 }
9fb70b7b34ff Clean up error handling for field parsing. Matti Hamalainen <ccr@tnsp.org> parents: 75 diff changeset	203
9fb70b7b34ff Clean up error handling for field parsing. Matti Hamalainen <ccr@tnsp.org> parents: 75 diff changeset	204
59 718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	205 BOOL siStackAddItem(PSFStack stack, const PSFStackItem item)
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	206 {
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	207 if (stack->items == NULL \|\| stack->nitems + 1 >= stack->nallocated)
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	208 {
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	209 stack->nallocated += 16;
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	210 if ((stack->items = th_realloc(stack->items, stack->nallocated * sizeof(PSFStackItem))) == NULL)
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	211 {
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	212 THERR("Could not allocate memory for format item stack.\n");
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	213 return FALSE;
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	214 }
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	215 }
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	216
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	217 memcpy(stack->items + stack->nitems, item, sizeof(PSFStackItem));
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	218 stack->nitems++;
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	219 return TRUE;
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	220 }
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	221
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	222
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	223 void siClearStack(PSFStack *stack)
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	224 {
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	225 if (stack != NULL)
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	226 {
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	227 if (stack->nitems > 0 && stack->items != NULL)
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	228 {
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	229 int n;
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	230 for (n = 0; n < stack->nitems; n++)
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	231 {
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	232 if (stack->items[n].cmd == -1)
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	233 th_free(stack->items[n].str);
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	234 }
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	235 th_free(stack->items);
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	236 }
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	237 memset(stack, 0, sizeof(PSFStack));
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	238 }
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	239 }
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	240
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	241
109 59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	242 BOOL argParsePSFields(PSFStack stack, const char fmt)
59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	243 {
59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	244 const char *start = fmt;
59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	245 siClearStack(stack);
59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	246
59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	247 while (*start)
59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	248 {
59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	249 PSFStackItem item;
59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	250 const char *end = strchr(start, ',');
59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	251 char *field = (end != NULL) ?
116 d062312ea850 Fix th_strndup_trim() usage. Matti Hamalainen <ccr@tnsp.org> parents: 115 diff changeset	252 th_strndup_trim(start, end - start, TH_TRIM_BOTH) :
109 59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	253 th_strdup_trim(start, TH_TRIM_BOTH);
59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	254
118 24583e5ca0b3 Simplify. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	255 if (field != NULL)
24583e5ca0b3 Simplify. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	256 {
24583e5ca0b3 Simplify. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	257 int found = argMatchPSFieldError(field);
24583e5ca0b3 Simplify. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	258 th_free(field);
109 59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	259
118 24583e5ca0b3 Simplify. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	260 if (found < 0)
24583e5ca0b3 Simplify. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	261 return FALSE;
109 59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	262
118 24583e5ca0b3 Simplify. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	263 item.cmd = found;
24583e5ca0b3 Simplify. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	264 item.str = NULL;
24583e5ca0b3 Simplify. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	265 if (!siStackAddItem(stack, &item))
24583e5ca0b3 Simplify. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	266 return FALSE;
24583e5ca0b3 Simplify. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	267 }
109 59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	268
59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	269 if (!end)
59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	270 break;
59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	271
59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	272 start = end + 1;
59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	273 }
59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	274
59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	275 return TRUE;
59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	276 }
59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	277
59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	278
147 f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	279 int siItemFormatStrPutInt(th_vprintf_ctx *ctx, th_vprintf_putch vputch,
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	280 const int value, const int f_radix, int f_flags, int f_width, int f_prec,
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	281 const BOOL f_unsig, char (f_alt)(const char buf, const size_t blen, const int vret, const int flags))
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	282 {
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	283 char buf[64];
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	284 int f_len = 0, vret;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	285 BOOL f_neg = FALSE;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	286
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	287 vret = th_vprintf_buf_int(buf, sizeof(buf), &f_len, value,
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	288 f_radix, f_flags & TH_PF_UPCASE, f_unsig, &f_neg);
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	289
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	290 if (vret == EOF)
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	291 return 0;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	292
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	293 return th_vprintf_put_int_format(ctx, vputch, buf, f_flags, f_width, f_prec, f_len, vret, f_neg, f_unsig, f_alt);
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	294 }
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	295
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	296
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	297 int siItemFormatStrPrintDo(th_vprintf_ctx ctx, th_vprintf_putch vputch, const char fmt,
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	298 const PSFOption opt, const char d_str, const int d_int)
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	299 {
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	300 int ret = 0;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	301
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	302 while (*fmt)
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	303 {
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	304 if (*fmt != '%')
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	305 {
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	306 if ((ret = vputch(ctx, *fmt)) == EOF)
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	307 goto out;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	308 }
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	309 else
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	310 {
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	311 int f_width = -1, f_prec = -1, f_flags = 0;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	312 BOOL end = FALSE;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	313
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	314 fmt++;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	315
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	316 // Check for flags
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	317 while (!end)
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	318 {
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	319 switch (*fmt)
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	320 {
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	321 case '#':
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	322 f_flags \|= TH_PF_ALT;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	323 break;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	324
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	325 case '+':
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	326 f_flags \|= TH_PF_SIGN;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	327 break;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	328
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	329 case '0':
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	330 f_flags \|= TH_PF_ZERO;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	331 break;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	332
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	333 case '-':
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	334 f_flags \|= TH_PF_LEFT;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	335 break;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	336
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	337 case ' ':
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	338 f_flags \|= TH_PF_SPACE;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	339 break;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	340
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	341 case '\'':
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	342 f_flags \|= TH_PF_GROUP;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	343 break;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	344
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	345 default:
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	346 end = TRUE;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	347 break;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	348 }
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	349 if (!end) fmt++;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	350 }
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	351
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	352 // Get field width
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	353 if (fmt == '')
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	354 {
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	355 return -101;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	356 }
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	357 else
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	358 {
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	359 f_width = 0;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	360 while (th_isdigit(*fmt))
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	361 f_width = f_width * 10 + (*fmt++ - '0');
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	362 }
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	363
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	364 // Check for field precision
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	365 if (*fmt == '.')
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	366 {
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	367 fmt++;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	368 if (fmt == '')
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	369 {
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	370 return -102;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	371 }
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	372 else
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	373 {
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	374 // If no digit after '.', precision is to be 0
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	375 f_prec = 0;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	376 while (th_isdigit(*fmt))
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	377 f_prec = f_prec * 10 + (*fmt++ - '0');
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	378 }
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	379 }
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	380
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	381
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	382 // Check for length modifiers (only some are supported currently)
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	383 switch (*fmt)
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	384 {
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	385 case 0:
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	386 return -104;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	387
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	388 case 'o':
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	389 if (opt->type != OTYPE_INT) return -120;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	390 if ((ret = siItemFormatStrPutInt(ctx, vputch, d_int, 8, f_flags, f_width, f_prec, TRUE, th_vprintf_altfmt_oct)) == EOF)
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	391 goto out;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	392 break;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	393
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	394 case 'u':
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	395 case 'i':
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	396 case 'd':
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	397 if (opt->type != OTYPE_INT) return -120;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	398 if ((ret = siItemFormatStrPutInt(ctx, vputch, d_int, 10, f_flags, f_width, f_prec, *fmt == 'u', NULL)) == EOF)
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	399 goto out;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	400 break;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	401
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	402 case 'x':
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	403 case 'X':
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	404 if (opt->type != OTYPE_INT) return -120;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	405 if (*fmt == 'X')
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	406 f_flags \|= TH_PF_UPCASE;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	407 if ((ret = siItemFormatStrPutInt(ctx, vputch, d_int, 16, f_flags, f_width, f_prec, TRUE, th_vprintf_altfmt_hex)) == EOF)
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	408 goto out;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	409 break;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	410
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	411 case 's':
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	412 if (opt->type != OTYPE_STR) return -121;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	413 if ((ret = th_vprintf_put_str(ctx, vputch, d_str, f_flags, f_width, f_prec)) == EOF)
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	414 goto out;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	415 break;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	416
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	417 //case '%':
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	418 default:
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	419 if ((ret = vputch(ctx, *fmt)) == EOF)
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	420 goto out;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	421 break;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	422 }
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	423 }
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	424 fmt++;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	425 }
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	426
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	427 out:
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	428 return ret == EOF ? ret : ctx->ipos;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	429 }
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	430
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	431
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	432 static int siItemFormatStrPutCH(th_vprintf_ctx *ctx, const char ch)
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	433 {
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	434 if (ctx->pos + 1 >= ctx->size)
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	435 {
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	436 ctx->size += 64;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	437 if ((ctx->buf = th_realloc(ctx->buf, ctx->size)) == NULL)
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	438 return EOF;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	439 }
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	440
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	441 ctx->buf[ctx->pos] = ch;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	442
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	443 ctx->pos++;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	444 ctx->ipos++;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	445 return ch;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	446 }
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	447
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	448
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	449 char * siItemFormatStrPrint(const char fmt, const PSFOption opt, const char *d_str, const int d_int)
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	450 {
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	451 th_vprintf_ctx ctx;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	452
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	453 ctx.size = 128;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	454 ctx.buf = th_malloc(ctx.size);
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	455 ctx.pos = 0;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	456 ctx.ipos = 0;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	457
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	458 if (ctx.buf == NULL)
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	459 return NULL;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	460
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	461 if (siItemFormatStrPrintDo(&ctx, siItemFormatStrPutCH, fmt, opt, d_str, d_int) <= 0)
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	462 goto err;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	463
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	464 if (siItemFormatStrPutCH(&ctx, 0) < 0)
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	465 goto err;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	466
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	467 return ctx.buf;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	468
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	469 err:
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	470 th_free(ctx.buf);
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	471 return NULL;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	472 }
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	473
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	474
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	475 static int siItemFormatStrPutCHNone(th_vprintf_ctx *ctx, const char ch)
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	476 {
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	477 ctx->pos++;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	478 ctx->ipos++;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	479 return ch;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	480 }
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	481
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	482
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	483 BOOL siItemFormatStrCheck(const char fmt, const PSFOption opt)
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	484 {
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	485 th_vprintf_ctx ctx;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	486
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	487 memset(&ctx, 0, sizeof(ctx));
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	488
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	489 return siItemFormatStrPrintDo(&ctx, siItemFormatStrPutCHNone, fmt, opt, NULL, 0) >= 0;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	490 }
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	491
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	492
79 5709d0beb394 Avoid using a global variable here. Matti Hamalainen <ccr@tnsp.org> parents: 78 diff changeset	493 //
5709d0beb394 Avoid using a global variable here. Matti Hamalainen <ccr@tnsp.org> parents: 78 diff changeset	494 // Parse a format string into a PSFStack structure
5709d0beb394 Avoid using a global variable here. Matti Hamalainen <ccr@tnsp.org> parents: 78 diff changeset	495 //
5709d0beb394 Avoid using a global variable here. Matti Hamalainen <ccr@tnsp.org> parents: 78 diff changeset	496 BOOL argParsePSFormatStr(PSFStack stack, const char fmt)
59 718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	497 {
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	498 PSFStackItem item;
83 c54d74312080 Fix some warnings. Matti Hamalainen <ccr@tnsp.org> parents: 82 diff changeset	499 const char *start = NULL;
59 718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	500 int mode = 0;
113 cd97e7517e21 Simplify error handling logic. Matti Hamalainen <ccr@tnsp.org> parents: 112 diff changeset	501 BOOL rval = TRUE;
59 718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	502
79 5709d0beb394 Avoid using a global variable here. Matti Hamalainen <ccr@tnsp.org> parents: 78 diff changeset	503 siClearStack(stack);
59 718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	504
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	505 while (mode != -1)
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	506 switch (mode)
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	507 {
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	508 case 0:
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	509 if (*fmt == '@')
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	510 {
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	511 start = fmt + 1;
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	512 mode = 1;
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	513 }
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	514 else
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	515 {
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	516 start = fmt;
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	517 mode = 2;
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	518 }
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	519 fmt++;
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	520 break;
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	521
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	522 case 1:
143 e481947fd051 Improve format string parsing. Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	523 if (*fmt != '@')
e481947fd051 Improve format string parsing. Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	524 {
e481947fd051 Improve format string parsing. Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	525 if (*fmt == 0)
e481947fd051 Improve format string parsing. Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	526 mode = -1;
e481947fd051 Improve format string parsing. Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	527 fmt++;
e481947fd051 Improve format string parsing. Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	528 break;
e481947fd051 Improve format string parsing. Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	529 }
e481947fd051 Improve format string parsing. Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	530
e481947fd051 Improve format string parsing. Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	531 if (fmt - start == 0)
59 718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	532 {
143 e481947fd051 Improve format string parsing. Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	533 item.cmd = -2;
e481947fd051 Improve format string parsing. Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	534 item.str = NULL;
e481947fd051 Improve format string parsing. Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	535 item.chr = '@';
e481947fd051 Improve format string parsing. Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	536 if (!siStackAddItem(stack, &item))
e481947fd051 Improve format string parsing. Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	537 return FALSE;
e481947fd051 Improve format string parsing. Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	538 }
e481947fd051 Improve format string parsing. Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	539 else
e481947fd051 Improve format string parsing. Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	540 {
147 f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	541 char fopt = NULL, pfield, *field = th_strndup_trim(start, fmt - start, TH_TRIM_BOTH);
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	542 if ((pfield = strchr(field, ':')) != NULL)
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	543 {
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	544 *pfield = 0;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	545 fopt = th_strdup_trim(pfield + 1, TH_TRIM_BOTH);
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	546 }
143 e481947fd051 Improve format string parsing. Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	547
e481947fd051 Improve format string parsing. Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	548 int ret = argMatchPSFieldError(field);
e481947fd051 Improve format string parsing. Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	549 if (ret >= 0)
59 718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	550 {
143 e481947fd051 Improve format string parsing. Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	551 item.cmd = ret;
e481947fd051 Improve format string parsing. Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	552 item.flags = 0;
147 f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	553 item.fmt = NULL;
59 718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	554 item.str = NULL;
143 e481947fd051 Improve format string parsing. Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	555
147 f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	556 if (fopt != NULL)
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	557 {
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	558 if (siItemFormatStrCheck(fopt, &optPSOptions[item.cmd]))
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	559 {
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	560 item.flags \|= OFMT_FORMAT;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	561 item.fmt = th_strdup(fopt);
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	562 }
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	563 else
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	564 {
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	565 THERR("Invalid field format specifier '%s' in '%s'.\n", fopt, field);
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	566 rval = FALSE;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	567 }
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	568 }
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	569
79 5709d0beb394 Avoid using a global variable here. Matti Hamalainen <ccr@tnsp.org> parents: 78 diff changeset	570 if (!siStackAddItem(stack, &item))
143 e481947fd051 Improve format string parsing. Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	571 rval = FALSE;
59 718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	572 }
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	573 else
143 e481947fd051 Improve format string parsing. Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	574 rval = FALSE;
e481947fd051 Improve format string parsing. Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	575
147 f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	576 th_free(fopt);
143 e481947fd051 Improve format string parsing. Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	577 th_free(field);
59 718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	578 }
143 e481947fd051 Improve format string parsing. Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	579
e481947fd051 Improve format string parsing. Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	580 mode = 0;
59 718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	581 fmt++;
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	582 break;
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	583
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	584 case 2:
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	585 if (fmt == 0 \|\| fmt == '@')
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	586 {
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	587 item.cmd = -1;
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	588 item.str = th_strndup(start, fmt - start);
79 5709d0beb394 Avoid using a global variable here. Matti Hamalainen <ccr@tnsp.org> parents: 78 diff changeset	589 if (!siStackAddItem(stack, &item))
59 718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	590 return FALSE;
79 5709d0beb394 Avoid using a global variable here. Matti Hamalainen <ccr@tnsp.org> parents: 78 diff changeset	591
59 718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	592 mode = (*fmt == 0) ? -1 : 0;
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	593 }
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	594 else
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	595 fmt++;
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	596 break;
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	597 }
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	598
113 cd97e7517e21 Simplify error handling logic. Matti Hamalainen <ccr@tnsp.org> parents: 112 diff changeset	599 return rval;
59 718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	600 }
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	601
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	602
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	603 BOOL argHandleOpt(const int optN, char optArg, char currArg)
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	604 {
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	605 switch (optN)
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	606 {
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	607 case 0:
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	608 argShowHelp();
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	609 exit(0);
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	610 break;
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	611
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	612 case 1:
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	613 th_verbosityLevel++;
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	614 break;
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	615
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	616 case 2:
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	617 optParsable = TRUE;
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	618 break;
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	619
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	620 case 3:
109 59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	621 if (!argParsePSFields(&optFormat, optArg))
59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	622 return FALSE;
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	623 break;
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	624
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	625 case 4:
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	626 optHexadecimal = TRUE;
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	627 break;
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	628
7 36c43f085b28 Add NoPrefix option -n. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	629 case 5:
36c43f085b28 Add NoPrefix option -n. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	630 optNoNamePrefix = TRUE;
36c43f085b28 Add NoPrefix option -n. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	631 break;
36c43f085b28 Add NoPrefix option -n. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	632
29 d4ec69beb160 Add one line output format. Matti Hamalainen <ccr@tnsp.org> parents: 28 diff changeset	633 case 6:
d4ec69beb160 Add one line output format. Matti Hamalainen <ccr@tnsp.org> parents: 28 diff changeset	634 optOneLine = TRUE;
33 39d9df17c8b1 Add field separator argument to -l option. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	635 optFieldSep = optArg;
29 d4ec69beb160 Add one line output format. Matti Hamalainen <ccr@tnsp.org> parents: 28 diff changeset	636 break;
d4ec69beb160 Add one line output format. Matti Hamalainen <ccr@tnsp.org> parents: 28 diff changeset	637
59 718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	638 case 7:
111 c7ecf56d23e7 Rename a variable. Matti Hamalainen <ccr@tnsp.org> parents: 110 diff changeset	639 optFieldOutput = FALSE;
79 5709d0beb394 Avoid using a global variable here. Matti Hamalainen <ccr@tnsp.org> parents: 78 diff changeset	640 if (!argParsePSFormatStr(&optFormat, optArg))
59 718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	641 return FALSE;
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	642 break;
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	643
89 d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	644 case 8:
d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	645 setHVSCPath = th_strdup(optArg);
d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	646 break;
d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	647
d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	648 case 9:
d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	649 setSLDBPath = th_strdup(optArg);
d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	650 break;
d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	651
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	652 default:
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	653 THERR("Unknown option '%s'.\n", currArg);
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	654 return FALSE;
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	655 }
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	656
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	657 return TRUE;
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	658 }
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	659
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	660
62 0d01efc3c803 Factor escape printing to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 61 diff changeset	661 static void siPrintStrEscapes(FILE outFile, const char str)
0d01efc3c803 Factor escape printing to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 61 diff changeset	662 {
0d01efc3c803 Factor escape printing to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 61 diff changeset	663 while (*str)
0d01efc3c803 Factor escape printing to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 61 diff changeset	664 {
0d01efc3c803 Factor escape printing to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 61 diff changeset	665 if (*str == '\\')
82 82679cccaa32 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	666 switch (*(++str))
62 0d01efc3c803 Factor escape printing to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 61 diff changeset	667 {
82 82679cccaa32 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	668 case 'n': fputc('\n', outFile); break;
82679cccaa32 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	669 case 'r': fputc('\r', outFile); break;
82679cccaa32 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	670 case 't': fputc('\r', outFile); break;
82679cccaa32 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	671 case '\\': fputc('\\', outFile); break;
82679cccaa32 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	672 default: fputc(*str, outFile); break;
62 0d01efc3c803 Factor escape printing to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 61 diff changeset	673 }
0d01efc3c803 Factor escape printing to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 61 diff changeset	674 else
0d01efc3c803 Factor escape printing to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 61 diff changeset	675 fputc(*str, outFile);
0d01efc3c803 Factor escape printing to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 61 diff changeset	676
0d01efc3c803 Factor escape printing to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 61 diff changeset	677 str++;
0d01efc3c803 Factor escape printing to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 61 diff changeset	678 }
0d01efc3c803 Factor escape printing to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 61 diff changeset	679 }
0d01efc3c803 Factor escape printing to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 61 diff changeset	680
0d01efc3c803 Factor escape printing to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 61 diff changeset	681
89 d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	682 static void siPrintFieldPrefix(FILE outFile, const PSFOption opt)
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	683 {
89 d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	684 const char *name = (optParsable \|\| opt->lname == NULL) ? opt->name : opt->lname;
111 c7ecf56d23e7 Rename a variable. Matti Hamalainen <ccr@tnsp.org> parents: 110 diff changeset	685 if (!optNoNamePrefix && optFieldOutput)
29 d4ec69beb160 Add one line output format. Matti Hamalainen <ccr@tnsp.org> parents: 28 diff changeset	686 fprintf(outFile, optParsable ? "%s=" : "%-20s : ", name);
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	687 }
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	688
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	689
33 39d9df17c8b1 Add field separator argument to -l option. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	690 static void siPrintFieldSeparator(FILE *outFile)
39d9df17c8b1 Add field separator argument to -l option. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	691 {
111 c7ecf56d23e7 Rename a variable. Matti Hamalainen <ccr@tnsp.org> parents: 110 diff changeset	692 if (optFieldOutput)
83 c54d74312080 Fix some warnings. Matti Hamalainen <ccr@tnsp.org> parents: 82 diff changeset	693 fputs(optOneLine ? optFieldSep : "\n", outFile);
33 39d9df17c8b1 Add field separator argument to -l option. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	694 }
39d9df17c8b1 Add field separator argument to -l option. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	695
39d9df17c8b1 Add field separator argument to -l option. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	696
146 263cd25749a1 Simplify data printing. Matti Hamalainen <ccr@tnsp.org> parents: 145 diff changeset	697 static void siPrintPSIDInfoLine(FILE outFile, BOOL shown, const PSFStackItem item, const char d_str, const int d_int)
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	698 {
146 263cd25749a1 Simplify data printing. Matti Hamalainen <ccr@tnsp.org> parents: 145 diff changeset	699 const PSFOption *opt = &optPSOptions[item->cmd];
155 de75385f75e2 Simplify by removing few lines of duplicate code. Matti Hamalainen <ccr@tnsp.org> parents: 153 diff changeset	700 char fmt, str;
146 263cd25749a1 Simplify data printing. Matti Hamalainen <ccr@tnsp.org> parents: 145 diff changeset	701
263cd25749a1 Simplify data printing. Matti Hamalainen <ccr@tnsp.org> parents: 145 diff changeset	702 switch (opt->type)
263cd25749a1 Simplify data printing. Matti Hamalainen <ccr@tnsp.org> parents: 145 diff changeset	703 {
263cd25749a1 Simplify data printing. Matti Hamalainen <ccr@tnsp.org> parents: 145 diff changeset	704 case OTYPE_INT:
147 f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	705 if (item->flags & OFMT_FORMAT)
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	706 fmt = item->fmt;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	707 else
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	708 fmt = optHexadecimal ? "$%04x" : "%d";
146 263cd25749a1 Simplify data printing. Matti Hamalainen <ccr@tnsp.org> parents: 145 diff changeset	709 break;
263cd25749a1 Simplify data printing. Matti Hamalainen <ccr@tnsp.org> parents: 145 diff changeset	710
263cd25749a1 Simplify data printing. Matti Hamalainen <ccr@tnsp.org> parents: 145 diff changeset	711 case OTYPE_STR:
147 f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	712 if (item->flags & OFMT_FORMAT)
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	713 fmt = item->fmt;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	714 else
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	715 fmt = "%s";
155 de75385f75e2 Simplify by removing few lines of duplicate code. Matti Hamalainen <ccr@tnsp.org> parents: 153 diff changeset	716 break;
147 f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	717
155 de75385f75e2 Simplify by removing few lines of duplicate code. Matti Hamalainen <ccr@tnsp.org> parents: 153 diff changeset	718 default:
de75385f75e2 Simplify by removing few lines of duplicate code. Matti Hamalainen <ccr@tnsp.org> parents: 153 diff changeset	719 return;
146 263cd25749a1 Simplify data printing. Matti Hamalainen <ccr@tnsp.org> parents: 145 diff changeset	720 }
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	721
109 59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	722 siPrintFieldPrefix(outFile, opt);
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	723
155 de75385f75e2 Simplify by removing few lines of duplicate code. Matti Hamalainen <ccr@tnsp.org> parents: 153 diff changeset	724 str = siItemFormatStrPrint(fmt, opt, d_str, d_int);
146 263cd25749a1 Simplify data printing. Matti Hamalainen <ccr@tnsp.org> parents: 145 diff changeset	725 if (str != NULL)
263cd25749a1 Simplify data printing. Matti Hamalainen <ccr@tnsp.org> parents: 145 diff changeset	726 fputs(str, outFile);
3 dbe35d78e621 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	727
109 59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	728 siPrintFieldSeparator(outFile);
146 263cd25749a1 Simplify data printing. Matti Hamalainen <ccr@tnsp.org> parents: 145 diff changeset	729 th_free(str);
263cd25749a1 Simplify data printing. Matti Hamalainen <ccr@tnsp.org> parents: 145 diff changeset	730
109 59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	731 *shown = TRUE;
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	732 }
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	733
89 d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	734
156 717d143612e2 Simplify things by having separate PRS/PRI macros for printing string and Matti Hamalainen <ccr@tnsp.org> parents: 155 diff changeset	735 #define PRS(d_str, d_conv) siPrintPSIDInfoLine(outFile, shown, item, d_str, -1)
717d143612e2 Simplify things by having separate PRS/PRI macros for printing string and Matti Hamalainen <ccr@tnsp.org> parents: 155 diff changeset	736 #define PRI(d_int) siPrintPSIDInfoLine(outFile, shown, item, NULL, d_int)
9 c1fba4abf56f Make filename printing optional. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	737
59 718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	738
114 cc74a9871a44 Simplify. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	739 static void siPrintPSIDInformationField(FILE outFile, const char filename, const PSIDHeader psid, BOOL shown, const PSFStackItem *item)
55 54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	740 {
114 cc74a9871a44 Simplify. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	741 const PSFOption *opt = &optPSOptions[item->cmd];
150 0288c4d138f7 Make the hash field also formattable. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	742 char tmp[128];
146 263cd25749a1 Simplify data printing. Matti Hamalainen <ccr@tnsp.org> parents: 145 diff changeset	743
114 cc74a9871a44 Simplify. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	744 switch (item->cmd)
35 79e6d08b473f Add more information fields, including SID model, video clock speed, etc. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	745 {
156 717d143612e2 Simplify things by having separate PRS/PRI macros for printing string and Matti Hamalainen <ccr@tnsp.org> parents: 155 diff changeset	746 case 0: PRS(filename, FALSE); break;
717d143612e2 Simplify things by having separate PRS/PRI macros for printing string and Matti Hamalainen <ccr@tnsp.org> parents: 155 diff changeset	747 case 1: PRS(psid->magic, FALSE); break;
146 263cd25749a1 Simplify data printing. Matti Hamalainen <ccr@tnsp.org> parents: 145 diff changeset	748 case 2:
263cd25749a1 Simplify data printing. Matti Hamalainen <ccr@tnsp.org> parents: 145 diff changeset	749 snprintf(tmp, sizeof(tmp), "%d.%d", (psid->version & 0xff), (psid->version >> 8));
156 717d143612e2 Simplify things by having separate PRS/PRI macros for printing string and Matti Hamalainen <ccr@tnsp.org> parents: 155 diff changeset	750 PRS(tmp, FALSE);
146 263cd25749a1 Simplify data printing. Matti Hamalainen <ccr@tnsp.org> parents: 145 diff changeset	751 break;
263cd25749a1 Simplify data printing. Matti Hamalainen <ccr@tnsp.org> parents: 145 diff changeset	752 case 3:
156 717d143612e2 Simplify things by having separate PRS/PRI macros for printing string and Matti Hamalainen <ccr@tnsp.org> parents: 155 diff changeset	753 PRS((psid->flags & PSF_PLAYER_TYPE) ? "Compute! SIDPlayer MUS" : "Normal built-in", FALSE);
146 263cd25749a1 Simplify data printing. Matti Hamalainen <ccr@tnsp.org> parents: 145 diff changeset	754 break;
55 54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	755 case 4:
54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	756 if (psid->version >= 2)
156 717d143612e2 Simplify things by having separate PRS/PRI macros for printing string and Matti Hamalainen <ccr@tnsp.org> parents: 155 diff changeset	757 PRS((psid->flags & PSF_PLAYSID_TUNE) ? (psid->isRSID ? "C64 BASIC" : "PlaySID") : "C64 compatible", FALSE);
55 54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	758 break;
54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	759 case 5:
54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	760 if (psid->version >= 2)
156 717d143612e2 Simplify things by having separate PRS/PRI macros for printing string and Matti Hamalainen <ccr@tnsp.org> parents: 155 diff changeset	761 PRS(si_get_sid_clock_str((psid->flags >> 2) & PSF_CLOCK_MASK), FALSE);
55 54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	762 break;
54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	763 case 6:
54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	764 if (psid->version >= 2)
156 717d143612e2 Simplify things by having separate PRS/PRI macros for printing string and Matti Hamalainen <ccr@tnsp.org> parents: 155 diff changeset	765 PRS(si_get_sid_model_str((psid->flags >> 4) & PSF_MODEL_MASK), FALSE);
55 54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	766 break;
35 79e6d08b473f Add more information fields, including SID model, video clock speed, etc. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	767
156 717d143612e2 Simplify things by having separate PRS/PRI macros for printing string and Matti Hamalainen <ccr@tnsp.org> parents: 155 diff changeset	768 case 7: PRI(psid->dataOffset); break;
717d143612e2 Simplify things by having separate PRS/PRI macros for printing string and Matti Hamalainen <ccr@tnsp.org> parents: 155 diff changeset	769 case 8: PRI(psid->dataSize); break;
717d143612e2 Simplify things by having separate PRS/PRI macros for printing string and Matti Hamalainen <ccr@tnsp.org> parents: 155 diff changeset	770 case 9: PRI(psid->loadAddress); break;
717d143612e2 Simplify things by having separate PRS/PRI macros for printing string and Matti Hamalainen <ccr@tnsp.org> parents: 155 diff changeset	771 case 10: PRI(psid->initAddress); break;
717d143612e2 Simplify things by having separate PRS/PRI macros for printing string and Matti Hamalainen <ccr@tnsp.org> parents: 155 diff changeset	772 case 11: PRI(psid->playAddress); break;
717d143612e2 Simplify things by having separate PRS/PRI macros for printing string and Matti Hamalainen <ccr@tnsp.org> parents: 155 diff changeset	773 case 12: PRI(psid->nSongs); break;
717d143612e2 Simplify things by having separate PRS/PRI macros for printing string and Matti Hamalainen <ccr@tnsp.org> parents: 155 diff changeset	774 case 13: PRI(psid->startSong); break;
134 b9a3f93f69d1 Implement support for showing second and third SID chip addresses and models for PSID/RSID v3/v4 files. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	775
b9a3f93f69d1 Implement support for showing second and third SID chip addresses and models for PSID/RSID v3/v4 files. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	776 case 14:
b9a3f93f69d1 Implement support for showing second and third SID chip addresses and models for PSID/RSID v3/v4 files. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	777 if (psid->version >= 3)
b9a3f93f69d1 Implement support for showing second and third SID chip addresses and models for PSID/RSID v3/v4 files. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	778 {
b9a3f93f69d1 Implement support for showing second and third SID chip addresses and models for PSID/RSID v3/v4 files. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	779 int flags = (psid->flags >> 6) & PSF_MODEL_MASK;
b9a3f93f69d1 Implement support for showing second and third SID chip addresses and models for PSID/RSID v3/v4 files. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	780 if (flags == PSF_MODEL_UNKNOWN)
b9a3f93f69d1 Implement support for showing second and third SID chip addresses and models for PSID/RSID v3/v4 files. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	781 flags = (psid->flags >> 4) & PSF_MODEL_MASK;
b9a3f93f69d1 Implement support for showing second and third SID chip addresses and models for PSID/RSID v3/v4 files. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	782
156 717d143612e2 Simplify things by having separate PRS/PRI macros for printing string and Matti Hamalainen <ccr@tnsp.org> parents: 155 diff changeset	783 PRS(si_get_sid_model_str(flags), FALSE);
134 b9a3f93f69d1 Implement support for showing second and third SID chip addresses and models for PSID/RSID v3/v4 files. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	784 }
b9a3f93f69d1 Implement support for showing second and third SID chip addresses and models for PSID/RSID v3/v4 files. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	785 break;
b9a3f93f69d1 Implement support for showing second and third SID chip addresses and models for PSID/RSID v3/v4 files. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	786 case 15:
b9a3f93f69d1 Implement support for showing second and third SID chip addresses and models for PSID/RSID v3/v4 files. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	787 if (psid->version >= 4)
b9a3f93f69d1 Implement support for showing second and third SID chip addresses and models for PSID/RSID v3/v4 files. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	788 {
b9a3f93f69d1 Implement support for showing second and third SID chip addresses and models for PSID/RSID v3/v4 files. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	789 int flags = (psid->flags >> 8) & PSF_MODEL_MASK;
b9a3f93f69d1 Implement support for showing second and third SID chip addresses and models for PSID/RSID v3/v4 files. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	790 if (flags == PSF_MODEL_UNKNOWN)
b9a3f93f69d1 Implement support for showing second and third SID chip addresses and models for PSID/RSID v3/v4 files. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	791 flags = (psid->flags >> 4) & PSF_MODEL_MASK;
35 79e6d08b473f Add more information fields, including SID model, video clock speed, etc. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	792
156 717d143612e2 Simplify things by having separate PRS/PRI macros for printing string and Matti Hamalainen <ccr@tnsp.org> parents: 155 diff changeset	793 PRS(si_get_sid_model_str(flags), FALSE);
134 b9a3f93f69d1 Implement support for showing second and third SID chip addresses and models for PSID/RSID v3/v4 files. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	794 }
b9a3f93f69d1 Implement support for showing second and third SID chip addresses and models for PSID/RSID v3/v4 files. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	795 break;
b9a3f93f69d1 Implement support for showing second and third SID chip addresses and models for PSID/RSID v3/v4 files. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	796 case 16:
b9a3f93f69d1 Implement support for showing second and third SID chip addresses and models for PSID/RSID v3/v4 files. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	797 if (psid->version >= 3)
156 717d143612e2 Simplify things by having separate PRS/PRI macros for printing string and Matti Hamalainen <ccr@tnsp.org> parents: 155 diff changeset	798 PRI(0xD000 \| (psid->sid2Addr << 4));
134 b9a3f93f69d1 Implement support for showing second and third SID chip addresses and models for PSID/RSID v3/v4 files. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	799 break;
55 54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	800 case 17:
134 b9a3f93f69d1 Implement support for showing second and third SID chip addresses and models for PSID/RSID v3/v4 files. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	801 if (psid->version >= 4)
156 717d143612e2 Simplify things by having separate PRS/PRI macros for printing string and Matti Hamalainen <ccr@tnsp.org> parents: 155 diff changeset	802 PRI(0xD000 \| (psid->sid3Addr << 4));
134 b9a3f93f69d1 Implement support for showing second and third SID chip addresses and models for PSID/RSID v3/v4 files. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	803 break;
b9a3f93f69d1 Implement support for showing second and third SID chip addresses and models for PSID/RSID v3/v4 files. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	804
156 717d143612e2 Simplify things by having separate PRS/PRI macros for printing string and Matti Hamalainen <ccr@tnsp.org> parents: 155 diff changeset	805 case 18: PRS(psid->sidName, TRUE); break;
717d143612e2 Simplify things by having separate PRS/PRI macros for printing string and Matti Hamalainen <ccr@tnsp.org> parents: 155 diff changeset	806 case 19: PRS(psid->sidAuthor, TRUE); break;
717d143612e2 Simplify things by having separate PRS/PRI macros for printing string and Matti Hamalainen <ccr@tnsp.org> parents: 155 diff changeset	807 case 20: PRS(psid->sidCopyright, TRUE); break;
134 b9a3f93f69d1 Implement support for showing second and third SID chip addresses and models for PSID/RSID v3/v4 files. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	808
b9a3f93f69d1 Implement support for showing second and third SID chip addresses and models for PSID/RSID v3/v4 files. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	809 case 21:
140 9f96b37c4f75 Don't print songlengths field if there are none. Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	810 {
150 0288c4d138f7 Make the hash field also formattable. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	811 size_t i, k;
0288c4d138f7 Make the hash field also formattable. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	812 for (i = k = 0; i < TH_MD5HASH_LENGTH && k < sizeof(tmp) - 1; i++, k += 2)
0288c4d138f7 Make the hash field also formattable. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	813 sprintf(&tmp[k], "%02x", psid->hash[i]);
0288c4d138f7 Make the hash field also formattable. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	814
156 717d143612e2 Simplify things by having separate PRS/PRI macros for printing string and Matti Hamalainen <ccr@tnsp.org> parents: 155 diff changeset	815 PRS(tmp, FALSE);
140 9f96b37c4f75 Don't print songlengths field if there are none. Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	816 }
55 54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	817 break;
89 d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	818
134 b9a3f93f69d1 Implement support for showing second and third SID chip addresses and models for PSID/RSID v3/v4 files. Matti Hamalainen <ccr@tnsp.org> parents: 132 diff changeset	819 case 22:
142 da29f147afcb Better check for number of songlengths. Matti Hamalainen <ccr@tnsp.org> parents: 141 diff changeset	820 if (psid->lengths != NULL && psid->lengths->nlengths > 0)
89 d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	821 {
114 cc74a9871a44 Simplify. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	822 int i;
140 9f96b37c4f75 Don't print songlengths field if there are none. Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	823 siPrintFieldPrefix(outFile, opt);
114 cc74a9871a44 Simplify. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	824 for (i = 0; i < psid->lengths->nlengths; i++)
89 d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	825 {
114 cc74a9871a44 Simplify. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	826 int len = psid->lengths->lengths[i];
cc74a9871a44 Simplify. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	827 fprintf(outFile, "%d:%d%s", len / 60, len % 60,
cc74a9871a44 Simplify. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	828 (i < psid->lengths->nlengths - 1) ? " " : "");
89 d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	829 }
140 9f96b37c4f75 Don't print songlengths field if there are none. Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	830 siPrintFieldSeparator(outFile);
89 d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	831 }
d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	832 break;
29 d4ec69beb160 Add one line output format. Matti Hamalainen <ccr@tnsp.org> parents: 28 diff changeset	833 }
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	834 }
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	835
0 8e7e08bf7b9e Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	836
19 16cfbdf20eaf Handle multiple files. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	837 BOOL argHandleFile(char *filename)
16cfbdf20eaf Handle multiple files. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	838 {
126 c1462b7880e8 Make si_read_sid_file() to allocate the PSIDHeader struct itself, adjust Matti Hamalainen <ccr@tnsp.org> parents: 125 diff changeset	839 PSIDHeader *psid = NULL;
85 4c0ecb078591 Rename various variables and functions and change relevant places to use the Matti Hamalainen <ccr@tnsp.org> parents: 83 diff changeset	840 th_ioctx *inFile = NULL;
4c0ecb078591 Rename various variables and functions and change relevant places to use the Matti Hamalainen <ccr@tnsp.org> parents: 83 diff changeset	841 FILE *outFile;
55 54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	842 BOOL shown = FALSE;
54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	843
19 16cfbdf20eaf Handle multiple files. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	844 optNFiles++;
55 54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	845 outFile = stdout;
19 16cfbdf20eaf Handle multiple files. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	846
85 4c0ecb078591 Rename various variables and functions and change relevant places to use the Matti Hamalainen <ccr@tnsp.org> parents: 83 diff changeset	847 if ((inFile = th_io_fopen(&th_stdio_io_ops, filename, "rb")) == NULL)
19 16cfbdf20eaf Handle multiple files. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	848 {
16cfbdf20eaf Handle multiple files. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	849 THERR("Could not open file '%s'.\n", filename);
126 c1462b7880e8 Make si_read_sid_file() to allocate the PSIDHeader struct itself, adjust Matti Hamalainen <ccr@tnsp.org> parents: 125 diff changeset	850 goto error;
19 16cfbdf20eaf Handle multiple files. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	851 }
16cfbdf20eaf Handle multiple files. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	852
16cfbdf20eaf Handle multiple files. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	853 // Read PSID data
85 4c0ecb078591 Rename various variables and functions and change relevant places to use the Matti Hamalainen <ccr@tnsp.org> parents: 83 diff changeset	854 if (si_read_sid_file(inFile, &psid) != 0)
23 832c26cb1637 Improve option handling. Matti Hamalainen <ccr@tnsp.org> parents: 21 diff changeset	855 {
832c26cb1637 Improve option handling. Matti Hamalainen <ccr@tnsp.org> parents: 21 diff changeset	856 THERR("Error reading %s\n", filename);
19 16cfbdf20eaf Handle multiple files. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	857 goto error;
23 832c26cb1637 Improve option handling. Matti Hamalainen <ccr@tnsp.org> parents: 21 diff changeset	858 }
19 16cfbdf20eaf Handle multiple files. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	859
89 d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	860 // Get songlength information, if any
d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	861 if (sidSLDB != NULL)
126 c1462b7880e8 Make si_read_sid_file() to allocate the PSIDHeader struct itself, adjust Matti Hamalainen <ccr@tnsp.org> parents: 125 diff changeset	862 psid->lengths = si_sldb_get_by_hash(sidSLDB, psid->hash);
89 d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	863
19 16cfbdf20eaf Handle multiple files. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	864 // Output
147 f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	865 for (int index = 0; index < optFormat.nitems; index++)
59 718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	866 {
109 59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	867 PSFStackItem *item = &optFormat.items[index];
59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	868 switch (item->cmd)
59 718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	869 {
109 59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	870 case -1:
59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	871 siPrintStrEscapes(outFile, item->str);
59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	872 break;
59 718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	873
109 59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	874 case -2:
59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	875 fputc(item->chr, outFile);
59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	876 break;
59 718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	877
109 59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	878 default:
126 c1462b7880e8 Make si_read_sid_file() to allocate the PSIDHeader struct itself, adjust Matti Hamalainen <ccr@tnsp.org> parents: 125 diff changeset	879 siPrintPSIDInformationField(outFile, filename, psid, &shown, item);
109 59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	880 break;
59 718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	881 }
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	882 }
153 e3be2ae6120e Delete trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 150 diff changeset	883
111 c7ecf56d23e7 Rename a variable. Matti Hamalainen <ccr@tnsp.org> parents: 110 diff changeset	884 if (optFieldOutput)
55 54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	885 {
54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	886 if (shown && optOneLine)
54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	887 fprintf(outFile, "\n");
54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	888 }
19 16cfbdf20eaf Handle multiple files. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	889
16cfbdf20eaf Handle multiple files. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	890 // Shutdown
16cfbdf20eaf Handle multiple files. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	891 error:
126 c1462b7880e8 Make si_read_sid_file() to allocate the PSIDHeader struct itself, adjust Matti Hamalainen <ccr@tnsp.org> parents: 125 diff changeset	892 si_free_sid_file(psid);
85 4c0ecb078591 Rename various variables and functions and change relevant places to use the Matti Hamalainen <ccr@tnsp.org> parents: 83 diff changeset	893 th_io_free(inFile);
19 16cfbdf20eaf Handle multiple files. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	894
16cfbdf20eaf Handle multiple files. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	895 return TRUE;
16cfbdf20eaf Handle multiple files. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	896 }
16cfbdf20eaf Handle multiple files. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	897
16cfbdf20eaf Handle multiple files. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	898
0 8e7e08bf7b9e Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	899 int main(int argc, char *argv[])
8e7e08bf7b9e Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	900 {
8e7e08bf7b9e Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	901 // Initialize
148 01cde57da297 Bump version. Matti Hamalainen <ccr@tnsp.org> parents: 147 diff changeset	902 th_init("SIDInfo", "PSID/RSID information displayer", "0.7.0", NULL, NULL);
0 8e7e08bf7b9e Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	903 th_verbosityLevel = 0;
8e7e08bf7b9e Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	904
59 718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	905 memset(&optFormat, 0, sizeof(optFormat));
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	906
120 ecbc8cabd6a2 Initial work on iconv support. Matti Hamalainen <ccr@tnsp.org> parents: 118 diff changeset	907 // Initialize iconv, check if we have language/charset
135 b4b1aac8761c Add preprocessor guards around iconv stuff. Matti Hamalainen <ccr@tnsp.org> parents: 134 diff changeset	908 #ifdef HAVE_ICONV
b4b1aac8761c Add preprocessor guards around iconv stuff. Matti Hamalainen <ccr@tnsp.org> parents: 134 diff changeset	909 char *setLang = th_strdup(getenv("LANG"));
120 ecbc8cabd6a2 Initial work on iconv support. Matti Hamalainen <ccr@tnsp.org> parents: 118 diff changeset	910 if (setLang != NULL)
ecbc8cabd6a2 Initial work on iconv support. Matti Hamalainen <ccr@tnsp.org> parents: 118 diff changeset	911 {
ecbc8cabd6a2 Initial work on iconv support. Matti Hamalainen <ccr@tnsp.org> parents: 118 diff changeset	912 char *ptr = strchr(setLang, '.');
ecbc8cabd6a2 Initial work on iconv support. Matti Hamalainen <ccr@tnsp.org> parents: 118 diff changeset	913 if (ptr != NULL) strcpy(setLang, ptr + 1);
ecbc8cabd6a2 Initial work on iconv support. Matti Hamalainen <ccr@tnsp.org> parents: 118 diff changeset	914 }
ecbc8cabd6a2 Initial work on iconv support. Matti Hamalainen <ccr@tnsp.org> parents: 118 diff changeset	915
129 abed2715ea68 Fix iconv initialization. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	916 setChConv = iconv_open(setLang != NULL ? setLang : SET_DEF_CHARSET, "iso88591");
120 ecbc8cabd6a2 Initial work on iconv support. Matti Hamalainen <ccr@tnsp.org> parents: 118 diff changeset	917 setUseChConv = setChConv != (iconv_t) -1;
ecbc8cabd6a2 Initial work on iconv support. Matti Hamalainen <ccr@tnsp.org> parents: 118 diff changeset	918 th_free(setLang);
135 b4b1aac8761c Add preprocessor guards around iconv stuff. Matti Hamalainen <ccr@tnsp.org> parents: 134 diff changeset	919 #endif
120 ecbc8cabd6a2 Initial work on iconv support. Matti Hamalainen <ccr@tnsp.org> parents: 118 diff changeset	920
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	921 // Parse command line arguments
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	922 if (!th_args_process(argc, argv, optList, optListN,
23 832c26cb1637 Improve option handling. Matti Hamalainen <ccr@tnsp.org> parents: 21 diff changeset	923 argHandleOpt, argHandleFile, OPTH_ONLY_OPTS))
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	924 return -1;
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	925
29 d4ec69beb160 Add one line output format. Matti Hamalainen <ccr@tnsp.org> parents: 28 diff changeset	926 if (optOneLine)
d4ec69beb160 Add one line output format. Matti Hamalainen <ccr@tnsp.org> parents: 28 diff changeset	927 {
d4ec69beb160 Add one line output format. Matti Hamalainen <ccr@tnsp.org> parents: 28 diff changeset	928 optParsable = FALSE;
d4ec69beb160 Add one line output format. Matti Hamalainen <ccr@tnsp.org> parents: 28 diff changeset	929 optNoNamePrefix = TRUE;
d4ec69beb160 Add one line output format. Matti Hamalainen <ccr@tnsp.org> parents: 28 diff changeset	930 }
153 e3be2ae6120e Delete trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 150 diff changeset	931
111 c7ecf56d23e7 Rename a variable. Matti Hamalainen <ccr@tnsp.org> parents: 110 diff changeset	932 if (optFieldOutput && !optFormat.nitems)
109 59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	933 {
115 6843261b4cd6 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	934 PSFStackItem item;
109 59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	935 int i;
127 1786b9d77782 Rename a variable, cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	936
115 6843261b4cd6 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	937 memset(&item, 0, sizeof(item));
109 59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	938 siClearStack(&optFormat);
127 1786b9d77782 Rename a variable, cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	939
109 59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	940 for (i = 0; i < noptPSOptions; i++)
59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	941 {
59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	942 item.cmd = i;
59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	943 siStackAddItem(&optFormat, &item);
59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	944 }
59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	945 }
29 d4ec69beb160 Add one line output format. Matti Hamalainen <ccr@tnsp.org> parents: 28 diff changeset	946
90 2ab9ab4b59eb Some fixes. Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	947 // Check paths
89 d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	948 if (setHVSCPath != NULL)
d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	949 {
d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	950 if (setSLDBPath == NULL)
d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	951 setSLDBPath = th_strdup_printf("%s%c%s", setHVSCPath, TH_DIR_SEPARATOR, SET_SLDB_FILENAME);
d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	952 }
d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	953
d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	954 if (setSLDBPath != NULL)
d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	955 {
d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	956 // Initialize SLDB
110 e9dbedc4d5e4 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 109 diff changeset	957 int ret = THERR_OK;
127 1786b9d77782 Rename a variable, cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	958 th_ioctx *inFile = NULL;
1786b9d77782 Rename a variable, cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	959 if ((inFile = th_io_fopen(&th_stdio_io_ops, setSLDBPath, "r")) == NULL)
89 d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	960 {
106 9ff4f6da3db8 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 94 diff changeset	961 THERR("Could not open SLDB '%s'.\n",
9ff4f6da3db8 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 94 diff changeset	962 setSLDBPath);
110 e9dbedc4d5e4 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 109 diff changeset	963 goto err;
89 d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	964 }
d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	965
115 6843261b4cd6 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	966 THMSG(1, "Reading SLDB.\n");
110 e9dbedc4d5e4 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 109 diff changeset	967 if ((sidSLDB = si_sldb_new()) == NULL)
e9dbedc4d5e4 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 109 diff changeset	968 {
e9dbedc4d5e4 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 109 diff changeset	969 THERR("Could not allocate SLDB structure!\n");
e9dbedc4d5e4 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 109 diff changeset	970 goto err;
e9dbedc4d5e4 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 109 diff changeset	971 }
e9dbedc4d5e4 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 109 diff changeset	972
127 1786b9d77782 Rename a variable, cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	973 if ((ret = si_sldb_read(inFile, sidSLDB)) != THERR_OK)
89 d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	974 {
106 9ff4f6da3db8 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 94 diff changeset	975 THERR("Error parsing SLDB: %d, %s\n",
9ff4f6da3db8 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 94 diff changeset	976 ret, th_error_str(ret));
110 e9dbedc4d5e4 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 109 diff changeset	977 goto err;
89 d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	978 }
127 1786b9d77782 Rename a variable, cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	979 th_io_close(inFile);
89 d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	980
d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	981 if ((ret = si_sldb_build_index(sidSLDB)) != THERR_OK)
d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	982 {
106 9ff4f6da3db8 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 94 diff changeset	983 THERR("Error building SLDB index: %d, %s.\n",
9ff4f6da3db8 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 94 diff changeset	984 ret, th_error_str(ret));
110 e9dbedc4d5e4 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 109 diff changeset	985 goto err;
89 d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	986 }
110 e9dbedc4d5e4 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 109 diff changeset	987
e9dbedc4d5e4 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 109 diff changeset	988 err:
127 1786b9d77782 Rename a variable, cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	989 th_io_close(inFile);
89 d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	990 }
d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	991
23 832c26cb1637 Improve option handling. Matti Hamalainen <ccr@tnsp.org> parents: 21 diff changeset	992 // Process files
832c26cb1637 Improve option handling. Matti Hamalainen <ccr@tnsp.org> parents: 21 diff changeset	993 if (!th_args_process(argc, argv, optList, optListN,
832c26cb1637 Improve option handling. Matti Hamalainen <ccr@tnsp.org> parents: 21 diff changeset	994 argHandleOpt, argHandleFile, OPTH_ONLY_OTHER))
89 d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	995 goto out;
23 832c26cb1637 Improve option handling. Matti Hamalainen <ccr@tnsp.org> parents: 21 diff changeset	996
19 16cfbdf20eaf Handle multiple files. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	997 if (optNFiles == 0)
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	998 {
141 71725be55ed1 Do not show full help if no filenames are specified. Matti Hamalainen <ccr@tnsp.org> parents: 140 diff changeset	999 THERR("No filename(s) specified. Try --help.\n");
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	1000 }
1 25a3a142e909 Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	1001
89 d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	1002 out:
d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	1003
135 b4b1aac8761c Add preprocessor guards around iconv stuff. Matti Hamalainen <ccr@tnsp.org> parents: 134 diff changeset	1004 #ifdef HAVE_ICONV
120 ecbc8cabd6a2 Initial work on iconv support. Matti Hamalainen <ccr@tnsp.org> parents: 118 diff changeset	1005 if (setUseChConv)
ecbc8cabd6a2 Initial work on iconv support. Matti Hamalainen <ccr@tnsp.org> parents: 118 diff changeset	1006 iconv_close(setChConv);
135 b4b1aac8761c Add preprocessor guards around iconv stuff. Matti Hamalainen <ccr@tnsp.org> parents: 134 diff changeset	1007 #endif
120 ecbc8cabd6a2 Initial work on iconv support. Matti Hamalainen <ccr@tnsp.org> parents: 118 diff changeset	1008
89 d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	1009 th_free(setHVSCPath);
d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	1010 th_free(setSLDBPath);
d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	1011 si_sldb_free(sidSLDB);
19 16cfbdf20eaf Handle multiple files. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	1012 return 0;
0 8e7e08bf7b9e Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1013 }

Mercurial > hg > sidinfo

annotate sidinfo.c @ 156:717d143612e2