sidinfo: sidinfo.c annotate

annotate sidinfo.c @ 176:2e890e3d5684

Add functionality for escaping the separator characters (-l <str> option) in printed out string data.

author	Matti Hamalainen <ccr@tnsp.org>
date	Fri, 06 Jul 2018 21:09:35 +0300
parents	e203761c4007
children	6a73d17f0c34

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
171 d86ade7d0dfd Change copyright blurbs slightly. Matti Hamalainen <ccr@tnsp.org> parents: 169 diff changeset	3 * Programmed and designed by Matti 'ccr' Hämäläinen <ccr@tnsp.org>
169 da2fbfe18c60 Bump copyright years. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	4 * (C) Copyright 2014-2018 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"
176 2e890e3d5684 Add functionality for escaping the separator characters (-l <str> option) in printed out string data. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	9 #include "th_datastruct.h"
70 4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	10 #include "sidlib.h"
135 b4b1aac8761c Add preprocessor guards around iconv stuff. Matti Hamalainen <ccr@tnsp.org> parents: 134 diff changeset	11 #ifdef HAVE_ICONV
157 8fc887cb56d0 Implement iconv support for converting from PSID de-facto latin-1/ISO-8859-* Matti Hamalainen <ccr@tnsp.org> parents: 156 diff changeset	12 # include <iconv.h>
135 b4b1aac8761c Add preprocessor guards around iconv stuff. Matti Hamalainen <ccr@tnsp.org> parents: 134 diff changeset	13 #endif
70 4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	14
0 8e7e08bf7b9e Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	15
28 6240788fe172 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	16 // Some constants
144 6418286a7e4c Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 143 diff changeset	17 #define SET_DEF_CHARSET "utf-8"
163 179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 161 diff changeset	18 #define SET_SLDB_FILENAME "Songlengths.md5"
1 25a3a142e909 Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	19
121 a2c2c63311de Change in th_args API. Matti Hamalainen <ccr@tnsp.org> parents: 120 diff changeset	20
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	21 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	22 {
157 8fc887cb56d0 Implement iconv support for converting from PSID de-facto latin-1/ISO-8859-* Matti Hamalainen <ccr@tnsp.org> parents: 156 diff changeset	23 OFMT_QUOTED = 0x0001,
147 f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	24 OFMT_FORMAT = 0x0002,
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
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	27
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	28 enum
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	29 {
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	30 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	31 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	32 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	33 };
55d99dc7c35c Prepare for some possible future enhancements by specifying a type for each data field. Matti Hamalainen <ccr@tnsp.org> parents: 111 diff changeset	34
0 8e7e08bf7b9e Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	35
8e7e08bf7b9e Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	36 typedef struct
8e7e08bf7b9e Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	37 {
63 6bbe11ae6bf5 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	38 int cmd;
6bbe11ae6bf5 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	39 char *str;
6bbe11ae6bf5 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	40 char chr;
109 59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	41 int flags;
147 f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	42 char *fmt;
63 6bbe11ae6bf5 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	43 } PSFStackItem;
6bbe11ae6bf5 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	44
6bbe11ae6bf5 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	45
6bbe11ae6bf5 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	46 typedef struct
6bbe11ae6bf5 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	47 {
6bbe11ae6bf5 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	48 int nitems, nallocated;
6bbe11ae6bf5 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	49 PSFStackItem *items;
6bbe11ae6bf5 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	50 } PSFStack;
6bbe11ae6bf5 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	51
6bbe11ae6bf5 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	52
6bbe11ae6bf5 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	53 typedef struct
6bbe11ae6bf5 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	54 {
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	55 char *name;
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	56 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	57 int type;
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	58 } PSFOption;
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	59
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	60
109 59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	61 static const PSFOption optPSOptions[] =
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	62 {
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	63 { "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	64 { "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	65 { "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	66 { "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	67 { "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	68 { "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	69 { "SIDModel" , "SID model" , OTYPE_STR },
55 54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	70
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	71 { "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	72 { "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	73 { "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	74 { "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	75 { "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	76 { "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	77 { "StartSong" , "Start song" , OTYPE_INT },
28 6240788fe172 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	78
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	79 { "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	80 { "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	81 { "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	82 { "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	83
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	84 { "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	85 { "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	86 { "Copyright" , NULL , OTYPE_STR },
150 0288c4d138f7 Make the hash field also formattable. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	87 { "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	88
55d99dc7c35c Prepare for some possible future enhancements by specifying a type for each data field. Matti Hamalainen <ccr@tnsp.org> parents: 111 diff changeset	89 { "Songlengths" , "Song lengths" , OTYPE_OTHER },
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	90 };
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	91
109 59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	92 static const int noptPSOptions = sizeof(optPSOptions) / sizeof(optPSOptions[0]);
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	93
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	94
28 6240788fe172 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	95 // Option variables
89 d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	96 char *setHVSCPath = NULL,
d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	97 *setSLDBPath = NULL;
163 179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 161 diff changeset	98 BOOL setSLDBNewFormat = FALSE,
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 161 diff changeset	99 optParsable = FALSE,
7 36c43f085b28 Add NoPrefix option -n. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	100 optNoNamePrefix = FALSE,
29 d4ec69beb160 Add one line output format. Matti Hamalainen <ccr@tnsp.org> parents: 28 diff changeset	101 optHexadecimal = FALSE,
109 59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	102 optOneLine = FALSE,
111 c7ecf56d23e7 Rename a variable. Matti Hamalainen <ccr@tnsp.org> parents: 110 diff changeset	103 optFieldOutput = TRUE;
55 54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	104 char *optFieldSep = NULL;
19 16cfbdf20eaf Handle multiple files. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	105 int optNFiles = 0;
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	106
59 718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	107 PSFStack optFormat;
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	108
89 d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	109 SIDLibSLDB *sidSLDB = NULL;
d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	110
135 b4b1aac8761c Add preprocessor guards around iconv stuff. Matti Hamalainen <ccr@tnsp.org> parents: 134 diff changeset	111 #ifdef HAVE_ICONV
120 ecbc8cabd6a2 Initial work on iconv support. Matti Hamalainen <ccr@tnsp.org> parents: 118 diff changeset	112 BOOL setUseChConv;
ecbc8cabd6a2 Initial work on iconv support. Matti Hamalainen <ccr@tnsp.org> parents: 118 diff changeset	113 iconv_t setChConv;
135 b4b1aac8761c Add preprocessor guards around iconv stuff. Matti Hamalainen <ccr@tnsp.org> parents: 134 diff changeset	114 #endif
120 ecbc8cabd6a2 Initial work on iconv support. Matti Hamalainen <ccr@tnsp.org> parents: 118 diff changeset	115
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	116
28 6240788fe172 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	117 // Define option arguments
121 a2c2c63311de Change in th_args API. Matti Hamalainen <ccr@tnsp.org> parents: 120 diff changeset	118 static const th_optarg optList[] =
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	119 {
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	120 { 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	121 // { 1, 'v', "verbose", "Be more verbose", OPT_NONE },
173 23dcc2dc47a9 Add the license into the program itself, displayable via --license option. Matti Hamalainen <ccr@tnsp.org> parents: 172 diff changeset	122 {10, 0, "license", "Print out this program's license agreement", OPT_NONE },
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	123 { 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	124 { 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	125 { 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	126 { 3, 'f', "fields", "Show only specified field(s)", OPT_ARGREQ },
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	127 { 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	128 { 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	129 { 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	130 { 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	131 };
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	132
44 7b137e4e817c Fix to match the changes in th_args API. Matti Hamalainen <ccr@tnsp.org> parents: 41 diff changeset	133 static const int optListN = sizeof(optList) / sizeof(optList[0]);
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	134
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	135
173 23dcc2dc47a9 Add the license into the program itself, displayable via --license option. Matti Hamalainen <ccr@tnsp.org> parents: 172 diff changeset	136 void argShowLicense(void)
23dcc2dc47a9 Add the license into the program itself, displayable via --license option. Matti Hamalainen <ccr@tnsp.org> parents: 172 diff changeset	137 {
23dcc2dc47a9 Add the license into the program itself, displayable via --license option. Matti Hamalainen <ccr@tnsp.org> parents: 172 diff changeset	138 printf("%s - %s\n%s\n", th_prog_name, th_prog_desc, th_prog_author);
23dcc2dc47a9 Add the license into the program itself, displayable via --license option. Matti Hamalainen <ccr@tnsp.org> parents: 172 diff changeset	139 printf(
23dcc2dc47a9 Add the license into the program itself, displayable via --license option. Matti Hamalainen <ccr@tnsp.org> parents: 172 diff changeset	140 "\n"
23dcc2dc47a9 Add the license into the program itself, displayable via --license option. Matti Hamalainen <ccr@tnsp.org> parents: 172 diff changeset	141 "Redistribution and use in source and binary forms, with or without\n"
23dcc2dc47a9 Add the license into the program itself, displayable via --license option. Matti Hamalainen <ccr@tnsp.org> parents: 172 diff changeset	142 "modification, are permitted provided that the following conditions\n"
23dcc2dc47a9 Add the license into the program itself, displayable via --license option. Matti Hamalainen <ccr@tnsp.org> parents: 172 diff changeset	143 "are met:\n"
23dcc2dc47a9 Add the license into the program itself, displayable via --license option. Matti Hamalainen <ccr@tnsp.org> parents: 172 diff changeset	144 "\n"
23dcc2dc47a9 Add the license into the program itself, displayable via --license option. Matti Hamalainen <ccr@tnsp.org> parents: 172 diff changeset	145 " 1. Redistributions of source code must retain the above copyright\n"
23dcc2dc47a9 Add the license into the program itself, displayable via --license option. Matti Hamalainen <ccr@tnsp.org> parents: 172 diff changeset	146 " notice, this list of conditions and the following disclaimer.\n"
23dcc2dc47a9 Add the license into the program itself, displayable via --license option. Matti Hamalainen <ccr@tnsp.org> parents: 172 diff changeset	147 "\n"
23dcc2dc47a9 Add the license into the program itself, displayable via --license option. Matti Hamalainen <ccr@tnsp.org> parents: 172 diff changeset	148 " 2. Redistributions in binary form must reproduce the above copyright\n"
23dcc2dc47a9 Add the license into the program itself, displayable via --license option. Matti Hamalainen <ccr@tnsp.org> parents: 172 diff changeset	149 " notice, this list of conditions and the following disclaimer in\n"
23dcc2dc47a9 Add the license into the program itself, displayable via --license option. Matti Hamalainen <ccr@tnsp.org> parents: 172 diff changeset	150 " the documentation and/or other materials provided with the\n"
23dcc2dc47a9 Add the license into the program itself, displayable via --license option. Matti Hamalainen <ccr@tnsp.org> parents: 172 diff changeset	151 " distribution.\n"
23dcc2dc47a9 Add the license into the program itself, displayable via --license option. Matti Hamalainen <ccr@tnsp.org> parents: 172 diff changeset	152 "\n"
23dcc2dc47a9 Add the license into the program itself, displayable via --license option. Matti Hamalainen <ccr@tnsp.org> parents: 172 diff changeset	153 " 3. The name of the author may not be used to endorse or promote\n"
23dcc2dc47a9 Add the license into the program itself, displayable via --license option. Matti Hamalainen <ccr@tnsp.org> parents: 172 diff changeset	154 " products derived from this software without specific prior written\n"
23dcc2dc47a9 Add the license into the program itself, displayable via --license option. Matti Hamalainen <ccr@tnsp.org> parents: 172 diff changeset	155 " permission.\n"
23dcc2dc47a9 Add the license into the program itself, displayable via --license option. Matti Hamalainen <ccr@tnsp.org> parents: 172 diff changeset	156 "\n"
23dcc2dc47a9 Add the license into the program itself, displayable via --license option. Matti Hamalainen <ccr@tnsp.org> parents: 172 diff changeset	157 "THIS SOFTWARE IS PROVIDED BY THE AUTHOR \"AS IS\" AND ANY EXPRESS OR\n"
23dcc2dc47a9 Add the license into the program itself, displayable via --license option. Matti Hamalainen <ccr@tnsp.org> parents: 172 diff changeset	158 "IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED\n"
23dcc2dc47a9 Add the license into the program itself, displayable via --license option. Matti Hamalainen <ccr@tnsp.org> parents: 172 diff changeset	159 "WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\n"
23dcc2dc47a9 Add the license into the program itself, displayable via --license option. Matti Hamalainen <ccr@tnsp.org> parents: 172 diff changeset	160 "ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,\n"
23dcc2dc47a9 Add the license into the program itself, displayable via --license option. Matti Hamalainen <ccr@tnsp.org> parents: 172 diff changeset	161 "INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES\n"
23dcc2dc47a9 Add the license into the program itself, displayable via --license option. Matti Hamalainen <ccr@tnsp.org> parents: 172 diff changeset	162 "(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR\n"
23dcc2dc47a9 Add the license into the program itself, displayable via --license option. Matti Hamalainen <ccr@tnsp.org> parents: 172 diff changeset	163 "SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)\n"
23dcc2dc47a9 Add the license into the program itself, displayable via --license option. Matti Hamalainen <ccr@tnsp.org> parents: 172 diff changeset	164 "HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,\n"
23dcc2dc47a9 Add the license into the program itself, displayable via --license option. Matti Hamalainen <ccr@tnsp.org> parents: 172 diff changeset	165 "STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING\n"
23dcc2dc47a9 Add the license into the program itself, displayable via --license option. Matti Hamalainen <ccr@tnsp.org> parents: 172 diff changeset	166 "IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE\n"
23dcc2dc47a9 Add the license into the program itself, displayable via --license option. Matti Hamalainen <ccr@tnsp.org> parents: 172 diff changeset	167 "POSSIBILITY OF SUCH DAMAGE.\n"
23dcc2dc47a9 Add the license into the program itself, displayable via --license option. Matti Hamalainen <ccr@tnsp.org> parents: 172 diff changeset	168 );
23dcc2dc47a9 Add the license into the program itself, displayable via --license option. Matti Hamalainen <ccr@tnsp.org> parents: 172 diff changeset	169 }
23dcc2dc47a9 Add the license into the program itself, displayable via --license option. Matti Hamalainen <ccr@tnsp.org> parents: 172 diff changeset	170
23dcc2dc47a9 Add the license into the program itself, displayable via --license option. Matti Hamalainen <ccr@tnsp.org> parents: 172 diff changeset	171
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	172 void argShowHelp(void)
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	173 {
75 92a4065c41d0 Improve listing of available fields in --help. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	174 int index, len;
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	175
20 6058339ffe0e Update usage. Matti Hamalainen <ccr@tnsp.org> parents: 19 diff changeset	176 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	177 th_args_help(stdout, optList, optListN, 0);
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	178 printf(
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	179 "\n"
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	180 "Available fields:\n");
3 dbe35d78e621 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	181
109 59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	182 for (len = index = 0; index < noptPSOptions; index++)
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	183 {
109 59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	184 const PSFOption *opt = &optPSOptions[index];
75 92a4065c41d0 Improve listing of available fields in --help. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	185 len += strlen(opt->name) + 3;
92a4065c41d0 Improve listing of available fields in --help. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	186 if (len >= 72)
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	187 {
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	188 printf("\n");
75 92a4065c41d0 Improve listing of available fields in --help. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	189 len = 0;
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	190 }
109 59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	191 printf("%s%s", opt->name, (index < noptPSOptions - 1) ? ", " : "\n\n");
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	192 }
58 5ea07110f0cf Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 57 diff changeset	193
59 718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	194 printf(
61 6916aaeda941 Improve help. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	195 "Example: %s -x -p -f hash,copyright somesidfile.sid\n"
6916aaeda941 Improve help. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	196 "\n"
6916aaeda941 Improve help. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	197 "Format strings for '-F' option are composed of @fields@ that\n"
6916aaeda941 Improve help. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	198 "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	199 "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	200 "\n"
147 f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	201 "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	202 "-F \"@copyright:'%%-30s'@\"\n"
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	203 "\n"
89 d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	204 "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	205 "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	206 , th_prog_name);
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	207 }
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	208
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	209
78 9fb70b7b34ff Clean up error handling for field parsing. Matti Hamalainen <ccr@tnsp.org> parents: 75 diff changeset	210 int argMatchPSField(const char *field)
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	211 {
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	212 int index, found = -1;
109 59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	213 for (index = 0; index < noptPSOptions; index++)
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	214 {
109 59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	215 const PSFOption *opt = &optPSOptions[index];
78 9fb70b7b34ff Clean up error handling for field parsing. Matti Hamalainen <ccr@tnsp.org> parents: 75 diff changeset	216 if (th_strcasecmp(opt->name, field) == 0)
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	217 {
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	218 if (found >= 0)
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	219 return -2;
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	220 found = index;
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	221 }
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	222 }
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	223
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	224 return found;
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	225 }
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	226
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	227
78 9fb70b7b34ff Clean up error handling for field parsing. Matti Hamalainen <ccr@tnsp.org> parents: 75 diff changeset	228 int argMatchPSFieldError(const char *field)
9fb70b7b34ff Clean up error handling for field parsing. Matti Hamalainen <ccr@tnsp.org> parents: 75 diff changeset	229 {
9fb70b7b34ff Clean up error handling for field parsing. Matti Hamalainen <ccr@tnsp.org> parents: 75 diff changeset	230 int found = argMatchPSField(field);
9fb70b7b34ff Clean up error handling for field parsing. Matti Hamalainen <ccr@tnsp.org> parents: 75 diff changeset	231 switch (found)
9fb70b7b34ff Clean up error handling for field parsing. Matti Hamalainen <ccr@tnsp.org> parents: 75 diff changeset	232 {
9fb70b7b34ff Clean up error handling for field parsing. Matti Hamalainen <ccr@tnsp.org> parents: 75 diff changeset	233 case -1:
9fb70b7b34ff Clean up error handling for field parsing. Matti Hamalainen <ccr@tnsp.org> parents: 75 diff changeset	234 THERR("No such field '%s'.\n", field);
9fb70b7b34ff Clean up error handling for field parsing. Matti Hamalainen <ccr@tnsp.org> parents: 75 diff changeset	235 break;
9fb70b7b34ff Clean up error handling for field parsing. Matti Hamalainen <ccr@tnsp.org> parents: 75 diff changeset	236
9fb70b7b34ff Clean up error handling for field parsing. Matti Hamalainen <ccr@tnsp.org> parents: 75 diff changeset	237 case -2:
9fb70b7b34ff Clean up error handling for field parsing. Matti Hamalainen <ccr@tnsp.org> parents: 75 diff changeset	238 THERR("Field '%s' is ambiguous.\n", field);
9fb70b7b34ff Clean up error handling for field parsing. Matti Hamalainen <ccr@tnsp.org> parents: 75 diff changeset	239 break;
9fb70b7b34ff Clean up error handling for field parsing. Matti Hamalainen <ccr@tnsp.org> parents: 75 diff changeset	240 }
9fb70b7b34ff Clean up error handling for field parsing. Matti Hamalainen <ccr@tnsp.org> parents: 75 diff changeset	241 return found;
9fb70b7b34ff Clean up error handling for field parsing. Matti Hamalainen <ccr@tnsp.org> parents: 75 diff changeset	242 }
9fb70b7b34ff Clean up error handling for field parsing. Matti Hamalainen <ccr@tnsp.org> parents: 75 diff changeset	243
9fb70b7b34ff Clean up error handling for field parsing. Matti Hamalainen <ccr@tnsp.org> parents: 75 diff changeset	244
59 718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	245 BOOL siStackAddItem(PSFStack stack, const PSFStackItem item)
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	246 {
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	247 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	248 {
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	249 stack->nallocated += 16;
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	250 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	251 {
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	252 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	253 return FALSE;
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	254 }
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	255 }
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	256
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	257 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	258 stack->nitems++;
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	259 return TRUE;
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	260 }
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	261
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	262
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	263 void siClearStack(PSFStack *stack)
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	264 {
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	265 if (stack != NULL)
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	266 {
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	267 if (stack->nitems > 0 && stack->items != NULL)
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	268 {
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	269 int n;
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	270 for (n = 0; n < stack->nitems; n++)
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	271 {
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	272 if (stack->items[n].cmd == -1)
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	273 th_free(stack->items[n].str);
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	274 }
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	275 th_free(stack->items);
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	276 }
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	277 memset(stack, 0, sizeof(PSFStack));
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	278 }
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	279 }
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	280
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	281
109 59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	282 BOOL argParsePSFields(PSFStack stack, const char fmt)
59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	283 {
59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	284 const char *start = fmt;
59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	285 siClearStack(stack);
59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	286
59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	287 while (*start)
59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	288 {
59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	289 PSFStackItem item;
59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	290 const char *end = strchr(start, ',');
59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	291 char *field = (end != NULL) ?
116 d062312ea850 Fix th_strndup_trim() usage. Matti Hamalainen <ccr@tnsp.org> parents: 115 diff changeset	292 th_strndup_trim(start, end - start, TH_TRIM_BOTH) :
109 59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	293 th_strdup_trim(start, TH_TRIM_BOTH);
59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	294
118 24583e5ca0b3 Simplify. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	295 if (field != NULL)
24583e5ca0b3 Simplify. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	296 {
24583e5ca0b3 Simplify. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	297 int found = argMatchPSFieldError(field);
24583e5ca0b3 Simplify. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	298 th_free(field);
109 59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	299
118 24583e5ca0b3 Simplify. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	300 if (found < 0)
24583e5ca0b3 Simplify. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	301 return FALSE;
109 59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	302
118 24583e5ca0b3 Simplify. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	303 item.cmd = found;
24583e5ca0b3 Simplify. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	304 item.str = NULL;
24583e5ca0b3 Simplify. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	305 if (!siStackAddItem(stack, &item))
24583e5ca0b3 Simplify. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	306 return FALSE;
24583e5ca0b3 Simplify. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	307 }
109 59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	308
59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	309 if (!end)
59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	310 break;
59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	311
59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	312 start = end + 1;
59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	313 }
59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	314
59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	315 return TRUE;
59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	316 }
59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	317
59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	318
157 8fc887cb56d0 Implement iconv support for converting from PSID de-facto latin-1/ISO-8859-* Matti Hamalainen <ccr@tnsp.org> parents: 156 diff changeset	319 #ifdef HAVE_ICONV
8fc887cb56d0 Implement iconv support for converting from PSID de-facto latin-1/ISO-8859-* Matti Hamalainen <ccr@tnsp.org> parents: 156 diff changeset	320 char siConvertCharset(iconv_t ctx, const char src)
8fc887cb56d0 Implement iconv support for converting from PSID de-facto latin-1/ISO-8859-* Matti Hamalainen <ccr@tnsp.org> parents: 156 diff changeset	321 {
8fc887cb56d0 Implement iconv support for converting from PSID de-facto latin-1/ISO-8859-* Matti Hamalainen <ccr@tnsp.org> parents: 156 diff changeset	322 size_t srcLeft = strlen(src) + 1;
8fc887cb56d0 Implement iconv support for converting from PSID de-facto latin-1/ISO-8859-* Matti Hamalainen <ccr@tnsp.org> parents: 156 diff changeset	323 size_t outLeft = srcLeft * 2;
8fc887cb56d0 Implement iconv support for converting from PSID de-facto latin-1/ISO-8859-* Matti Hamalainen <ccr@tnsp.org> parents: 156 diff changeset	324 char outBuf, outPtr;
8fc887cb56d0 Implement iconv support for converting from PSID de-facto latin-1/ISO-8859-* Matti Hamalainen <ccr@tnsp.org> parents: 156 diff changeset	325 char srcPtr = (char ) src;
8fc887cb56d0 Implement iconv support for converting from PSID de-facto latin-1/ISO-8859-* Matti Hamalainen <ccr@tnsp.org> parents: 156 diff changeset	326
8fc887cb56d0 Implement iconv support for converting from PSID de-facto latin-1/ISO-8859-* Matti Hamalainen <ccr@tnsp.org> parents: 156 diff changeset	327 if ((outBuf = outPtr = th_malloc(outLeft + 1)) == NULL)
8fc887cb56d0 Implement iconv support for converting from PSID de-facto latin-1/ISO-8859-* Matti Hamalainen <ccr@tnsp.org> parents: 156 diff changeset	328 return NULL;
8fc887cb56d0 Implement iconv support for converting from PSID de-facto latin-1/ISO-8859-* Matti Hamalainen <ccr@tnsp.org> parents: 156 diff changeset	329
8fc887cb56d0 Implement iconv support for converting from PSID de-facto latin-1/ISO-8859-* Matti Hamalainen <ccr@tnsp.org> parents: 156 diff changeset	330 while (srcLeft > 0)
8fc887cb56d0 Implement iconv support for converting from PSID de-facto latin-1/ISO-8859-* Matti Hamalainen <ccr@tnsp.org> parents: 156 diff changeset	331 {
8fc887cb56d0 Implement iconv support for converting from PSID de-facto latin-1/ISO-8859-* Matti Hamalainen <ccr@tnsp.org> parents: 156 diff changeset	332 size_t ret = iconv(ctx, &srcPtr, &srcLeft, &outPtr, &outLeft);
8fc887cb56d0 Implement iconv support for converting from PSID de-facto latin-1/ISO-8859-* Matti Hamalainen <ccr@tnsp.org> parents: 156 diff changeset	333 if (ret == (size_t) -1)
8fc887cb56d0 Implement iconv support for converting from PSID de-facto latin-1/ISO-8859-* Matti Hamalainen <ccr@tnsp.org> parents: 156 diff changeset	334 break;
8fc887cb56d0 Implement iconv support for converting from PSID de-facto latin-1/ISO-8859-* Matti Hamalainen <ccr@tnsp.org> parents: 156 diff changeset	335 }
8fc887cb56d0 Implement iconv support for converting from PSID de-facto latin-1/ISO-8859-* Matti Hamalainen <ccr@tnsp.org> parents: 156 diff changeset	336
8fc887cb56d0 Implement iconv support for converting from PSID de-facto latin-1/ISO-8859-* Matti Hamalainen <ccr@tnsp.org> parents: 156 diff changeset	337 return outBuf;
8fc887cb56d0 Implement iconv support for converting from PSID de-facto latin-1/ISO-8859-* Matti Hamalainen <ccr@tnsp.org> parents: 156 diff changeset	338 }
8fc887cb56d0 Implement iconv support for converting from PSID de-facto latin-1/ISO-8859-* Matti Hamalainen <ccr@tnsp.org> parents: 156 diff changeset	339 #endif
8fc887cb56d0 Implement iconv support for converting from PSID de-facto latin-1/ISO-8859-* Matti Hamalainen <ccr@tnsp.org> parents: 156 diff changeset	340
8fc887cb56d0 Implement iconv support for converting from PSID de-facto latin-1/ISO-8859-* Matti Hamalainen <ccr@tnsp.org> parents: 156 diff changeset	341
147 f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	342 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	343 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	344 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	345 {
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	346 char buf[64];
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	347 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	348 BOOL f_neg = FALSE;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	349
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	350 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	351 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	352
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	353 if (vret == EOF)
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	354 return 0;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	355
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	356 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	357 }
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
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	360 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	361 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	362 {
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	363 int ret = 0;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	364
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	365 while (*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 if (*fmt != '%')
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	368 {
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	369 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	370 goto out;
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 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	375 BOOL end = FALSE;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	376
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	377 fmt++;
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 // Check for flags
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	380 while (!end)
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 switch (*fmt)
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	383 {
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	384 case '#':
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	385 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	386 break;
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 '+':
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	389 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	390 break;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	391
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	392 case '0':
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	393 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	394 break;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	395
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	396 case '-':
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	397 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	398 break;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	399
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	400 case ' ':
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	401 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	402 break;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	403
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	404 case '\'':
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	405 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	406 break;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	407
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	408 default:
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	409 end = TRUE;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	410 break;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	411 }
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	412 if (!end) fmt++;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	413 }
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	414
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	415 // Get field width
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	416 if (fmt == '')
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	417 {
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	418 return -101;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	419 }
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	420 else
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	421 {
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	422 f_width = 0;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	423 while (th_isdigit(*fmt))
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	424 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	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 // Check for field precision
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	428 if (*fmt == '.')
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 fmt++;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	431 if (fmt == '')
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	432 {
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	433 return -102;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	434 }
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	435 else
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	436 {
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	437 // 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	438 f_prec = 0;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	439 while (th_isdigit(*fmt))
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	440 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	441 }
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
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	444
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	445 // 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	446 switch (*fmt)
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 case 0:
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	449 return -104;
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 case 'o':
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	452 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	453 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	454 goto out;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	455 break;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	456
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	457 case 'u':
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	458 case 'i':
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	459 case 'd':
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	460 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	461 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	462 goto out;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	463 break;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	464
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	465 case 'x':
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	466 case 'X':
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	467 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	468 if (*fmt == 'X')
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	469 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	470 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	471 goto out;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	472 break;
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 case 's':
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	475 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	476 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	477 goto out;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	478 break;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	479
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	480 //case '%':
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	481 default:
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	482 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	483 goto out;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	484 break;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	485 }
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 fmt++;
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
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	490 out:
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	491 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	492 }
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	493
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	494
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	495 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	496 {
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	497 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	498 {
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	499 ctx->size += 64;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	500 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	501 return EOF;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	502 }
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	503
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	504 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	505
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	506 ctx->pos++;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	507 ctx->ipos++;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	508 return ch;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	509 }
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	510
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	511
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	512 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	513 {
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	514 th_vprintf_ctx ctx;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	515
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	516 ctx.size = 128;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	517 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	518 ctx.pos = 0;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	519 ctx.ipos = 0;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	520
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	521 if (ctx.buf == NULL)
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	522 return NULL;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	523
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	524 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	525 goto err;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	526
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	527 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	528 goto err;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	529
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	530 return ctx.buf;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	531
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	532 err:
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	533 th_free(ctx.buf);
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	534 return NULL;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	535 }
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	536
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	537
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	538 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	539 {
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	540 ctx->pos++;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	541 ctx->ipos++;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	542 return ch;
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
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	545
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	546 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	547 {
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	548 th_vprintf_ctx ctx;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	549
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	550 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	551
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	552 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	553 }
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	554
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	555
79 5709d0beb394 Avoid using a global variable here. Matti Hamalainen <ccr@tnsp.org> parents: 78 diff changeset	556 //
5709d0beb394 Avoid using a global variable here. Matti Hamalainen <ccr@tnsp.org> parents: 78 diff changeset	557 // Parse a format string into a PSFStack structure
5709d0beb394 Avoid using a global variable here. Matti Hamalainen <ccr@tnsp.org> parents: 78 diff changeset	558 //
5709d0beb394 Avoid using a global variable here. Matti Hamalainen <ccr@tnsp.org> parents: 78 diff changeset	559 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	560 {
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	561 PSFStackItem item;
83 c54d74312080 Fix some warnings. Matti Hamalainen <ccr@tnsp.org> parents: 82 diff changeset	562 const char *start = NULL;
59 718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	563 int mode = 0;
113 cd97e7517e21 Simplify error handling logic. Matti Hamalainen <ccr@tnsp.org> parents: 112 diff changeset	564 BOOL rval = TRUE;
59 718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	565
79 5709d0beb394 Avoid using a global variable here. Matti Hamalainen <ccr@tnsp.org> parents: 78 diff changeset	566 siClearStack(stack);
59 718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	567
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	568 while (mode != -1)
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	569 switch (mode)
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	570 {
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	571 case 0:
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	572 if (*fmt == '@')
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	573 {
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	574 start = fmt + 1;
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	575 mode = 1;
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	576 }
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	577 else
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	578 {
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	579 start = fmt;
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	580 mode = 2;
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	581 }
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	582 fmt++;
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	583 break;
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	584
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	585 case 1:
143 e481947fd051 Improve format string parsing. Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	586 if (*fmt != '@')
e481947fd051 Improve format string parsing. Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	587 {
e481947fd051 Improve format string parsing. Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	588 if (*fmt == 0)
e481947fd051 Improve format string parsing. Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	589 mode = -1;
e481947fd051 Improve format string parsing. Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	590 fmt++;
e481947fd051 Improve format string parsing. Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	591 break;
e481947fd051 Improve format string parsing. Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	592 }
e481947fd051 Improve format string parsing. Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	593
e481947fd051 Improve format string parsing. Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	594 if (fmt - start == 0)
59 718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	595 {
143 e481947fd051 Improve format string parsing. Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	596 item.cmd = -2;
e481947fd051 Improve format string parsing. Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	597 item.str = NULL;
e481947fd051 Improve format string parsing. Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	598 item.chr = '@';
e481947fd051 Improve format string parsing. Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	599 if (!siStackAddItem(stack, &item))
e481947fd051 Improve format string parsing. Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	600 return FALSE;
e481947fd051 Improve format string parsing. Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	601 }
e481947fd051 Improve format string parsing. Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	602 else
e481947fd051 Improve format string parsing. Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	603 {
147 f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	604 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	605 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	606 {
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	607 *pfield = 0;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	608 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	609 }
143 e481947fd051 Improve format string parsing. Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	610
e481947fd051 Improve format string parsing. Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	611 int ret = argMatchPSFieldError(field);
e481947fd051 Improve format string parsing. Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	612 if (ret >= 0)
59 718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	613 {
143 e481947fd051 Improve format string parsing. Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	614 item.cmd = ret;
e481947fd051 Improve format string parsing. Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	615 item.flags = 0;
147 f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	616 item.fmt = NULL;
59 718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	617 item.str = NULL;
143 e481947fd051 Improve format string parsing. Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	618
147 f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	619 if (fopt != NULL)
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	620 {
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	621 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	622 {
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	623 item.flags \|= OFMT_FORMAT;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	624 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	625 }
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	626 else
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	627 {
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	628 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	629 rval = FALSE;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	630 }
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	631 }
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	632
79 5709d0beb394 Avoid using a global variable here. Matti Hamalainen <ccr@tnsp.org> parents: 78 diff changeset	633 if (!siStackAddItem(stack, &item))
143 e481947fd051 Improve format string parsing. Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	634 rval = FALSE;
59 718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	635 }
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	636 else
143 e481947fd051 Improve format string parsing. Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	637 rval = FALSE;
e481947fd051 Improve format string parsing. Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	638
147 f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	639 th_free(fopt);
143 e481947fd051 Improve format string parsing. Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	640 th_free(field);
59 718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	641 }
143 e481947fd051 Improve format string parsing. Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	642
e481947fd051 Improve format string parsing. Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	643 mode = 0;
59 718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	644 fmt++;
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	645 break;
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	646
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	647 case 2:
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	648 if (fmt == 0 \|\| fmt == '@')
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	649 {
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	650 item.cmd = -1;
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	651 item.str = th_strndup(start, fmt - start);
79 5709d0beb394 Avoid using a global variable here. Matti Hamalainen <ccr@tnsp.org> parents: 78 diff changeset	652 if (!siStackAddItem(stack, &item))
59 718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	653 return FALSE;
79 5709d0beb394 Avoid using a global variable here. Matti Hamalainen <ccr@tnsp.org> parents: 78 diff changeset	654
59 718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	655 mode = (*fmt == 0) ? -1 : 0;
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	656 }
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	657 else
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	658 fmt++;
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	659 break;
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	660 }
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	661
113 cd97e7517e21 Simplify error handling logic. Matti Hamalainen <ccr@tnsp.org> parents: 112 diff changeset	662 return rval;
59 718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	663 }
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	664
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	665
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	666 BOOL argHandleOpt(const int optN, char optArg, char currArg)
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	667 {
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	668 switch (optN)
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	669 {
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	670 case 0:
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	671 argShowHelp();
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	672 exit(0);
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	673 break;
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	674
173 23dcc2dc47a9 Add the license into the program itself, displayable via --license option. Matti Hamalainen <ccr@tnsp.org> parents: 172 diff changeset	675 case 10:
23dcc2dc47a9 Add the license into the program itself, displayable via --license option. Matti Hamalainen <ccr@tnsp.org> parents: 172 diff changeset	676 argShowLicense();
23dcc2dc47a9 Add the license into the program itself, displayable via --license option. Matti Hamalainen <ccr@tnsp.org> parents: 172 diff changeset	677 exit(0);
23dcc2dc47a9 Add the license into the program itself, displayable via --license option. Matti Hamalainen <ccr@tnsp.org> parents: 172 diff changeset	678 break;
23dcc2dc47a9 Add the license into the program itself, displayable via --license option. Matti Hamalainen <ccr@tnsp.org> parents: 172 diff changeset	679
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	680 case 1:
172 6dcf4ca1dce7 Change to match th-libs' verbosity level changes. Matti Hamalainen <ccr@tnsp.org> parents: 171 diff changeset	681 th_verbosity++;
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	682 break;
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	683
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	684 case 2:
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	685 optParsable = TRUE;
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	686 break;
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 case 3:
109 59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	689 if (!argParsePSFields(&optFormat, optArg))
59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	690 return FALSE;
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	691 break;
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	692
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	693 case 4:
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	694 optHexadecimal = TRUE;
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	695 break;
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	696
7 36c43f085b28 Add NoPrefix option -n. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	697 case 5:
36c43f085b28 Add NoPrefix option -n. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	698 optNoNamePrefix = TRUE;
36c43f085b28 Add NoPrefix option -n. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	699 break;
36c43f085b28 Add NoPrefix option -n. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	700
29 d4ec69beb160 Add one line output format. Matti Hamalainen <ccr@tnsp.org> parents: 28 diff changeset	701 case 6:
d4ec69beb160 Add one line output format. Matti Hamalainen <ccr@tnsp.org> parents: 28 diff changeset	702 optOneLine = TRUE;
33 39d9df17c8b1 Add field separator argument to -l option. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	703 optFieldSep = optArg;
29 d4ec69beb160 Add one line output format. Matti Hamalainen <ccr@tnsp.org> parents: 28 diff changeset	704 break;
d4ec69beb160 Add one line output format. Matti Hamalainen <ccr@tnsp.org> parents: 28 diff changeset	705
59 718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	706 case 7:
111 c7ecf56d23e7 Rename a variable. Matti Hamalainen <ccr@tnsp.org> parents: 110 diff changeset	707 optFieldOutput = FALSE;
79 5709d0beb394 Avoid using a global variable here. Matti Hamalainen <ccr@tnsp.org> parents: 78 diff changeset	708 if (!argParsePSFormatStr(&optFormat, optArg))
59 718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	709 return FALSE;
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	710 break;
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	711
89 d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	712 case 8:
d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	713 setHVSCPath = th_strdup(optArg);
d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	714 break;
d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	715
d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	716 case 9:
d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	717 setSLDBPath = th_strdup(optArg);
d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	718 break;
d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	719
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	720 default:
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	721 THERR("Unknown option '%s'.\n", currArg);
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	722 return FALSE;
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	723 }
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	724
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	725 return TRUE;
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	726 }
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	727
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	728
176 2e890e3d5684 Add functionality for escaping the separator characters (-l <str> option) in printed out string data. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	729 static char * siEscapeString(const char str, const char esc)
2e890e3d5684 Add functionality for escaping the separator characters (-l <str> option) in printed out string data. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	730 {
2e890e3d5684 Add functionality for escaping the separator characters (-l <str> option) in printed out string data. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	731 if (str == NULL)
2e890e3d5684 Add functionality for escaping the separator characters (-l <str> option) in printed out string data. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	732 return NULL;
2e890e3d5684 Add functionality for escaping the separator characters (-l <str> option) in printed out string data. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	733
2e890e3d5684 Add functionality for escaping the separator characters (-l <str> option) in printed out string data. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	734 if (esc == NULL)
2e890e3d5684 Add functionality for escaping the separator characters (-l <str> option) in printed out string data. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	735 return th_strdup(str);
2e890e3d5684 Add functionality for escaping the separator characters (-l <str> option) in printed out string data. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	736
2e890e3d5684 Add functionality for escaping the separator characters (-l <str> option) in printed out string data. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	737 size_t len = 0, size = strlen(str) + 1;
2e890e3d5684 Add functionality for escaping the separator characters (-l <str> option) in printed out string data. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	738 char *buf = th_malloc(size);
2e890e3d5684 Add functionality for escaping the separator characters (-l <str> option) in printed out string data. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	739 if (buf == NULL)
2e890e3d5684 Add functionality for escaping the separator characters (-l <str> option) in printed out string data. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	740 return NULL;
2e890e3d5684 Add functionality for escaping the separator characters (-l <str> option) in printed out string data. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	741
2e890e3d5684 Add functionality for escaping the separator characters (-l <str> option) in printed out string data. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	742 while (*str)
2e890e3d5684 Add functionality for escaping the separator characters (-l <str> option) in printed out string data. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	743 {
2e890e3d5684 Add functionality for escaping the separator characters (-l <str> option) in printed out string data. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	744 if (strchr(esc, str) != NULL \|\| str == '\\')
2e890e3d5684 Add functionality for escaping the separator characters (-l <str> option) in printed out string data. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	745 {
2e890e3d5684 Add functionality for escaping the separator characters (-l <str> option) in printed out string data. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	746 if (!th_strbuf_putch(&buf, &size, &len, '\\'))
2e890e3d5684 Add functionality for escaping the separator characters (-l <str> option) in printed out string data. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	747 goto err;
2e890e3d5684 Add functionality for escaping the separator characters (-l <str> option) in printed out string data. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	748 }
2e890e3d5684 Add functionality for escaping the separator characters (-l <str> option) in printed out string data. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	749 if (!th_strbuf_putch(&buf, &size, &len, *str))
2e890e3d5684 Add functionality for escaping the separator characters (-l <str> option) in printed out string data. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	750 goto err;
2e890e3d5684 Add functionality for escaping the separator characters (-l <str> option) in printed out string data. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	751
2e890e3d5684 Add functionality for escaping the separator characters (-l <str> option) in printed out string data. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	752 str++;
2e890e3d5684 Add functionality for escaping the separator characters (-l <str> option) in printed out string data. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	753 }
2e890e3d5684 Add functionality for escaping the separator characters (-l <str> option) in printed out string data. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	754
2e890e3d5684 Add functionality for escaping the separator characters (-l <str> option) in printed out string data. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	755 if (!th_strbuf_putch(&buf, &size, &len, 0))
2e890e3d5684 Add functionality for escaping the separator characters (-l <str> option) in printed out string data. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	756 goto err;
2e890e3d5684 Add functionality for escaping the separator characters (-l <str> option) in printed out string data. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	757
2e890e3d5684 Add functionality for escaping the separator characters (-l <str> option) in printed out string data. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	758 return buf;
2e890e3d5684 Add functionality for escaping the separator characters (-l <str> option) in printed out string data. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	759
2e890e3d5684 Add functionality for escaping the separator characters (-l <str> option) in printed out string data. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	760 err:
2e890e3d5684 Add functionality for escaping the separator characters (-l <str> option) in printed out string data. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	761 th_free(buf);
2e890e3d5684 Add functionality for escaping the separator characters (-l <str> option) in printed out string data. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	762 return NULL;
2e890e3d5684 Add functionality for escaping the separator characters (-l <str> option) in printed out string data. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	763 }
2e890e3d5684 Add functionality for escaping the separator characters (-l <str> option) in printed out string data. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	764
2e890e3d5684 Add functionality for escaping the separator characters (-l <str> option) in printed out string data. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	765
62 0d01efc3c803 Factor escape printing to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 61 diff changeset	766 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	767 {
0d01efc3c803 Factor escape printing to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 61 diff changeset	768 while (*str)
0d01efc3c803 Factor escape printing to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 61 diff changeset	769 {
0d01efc3c803 Factor escape printing to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 61 diff changeset	770 if (*str == '\\')
82 82679cccaa32 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	771 switch (*(++str))
62 0d01efc3c803 Factor escape printing to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 61 diff changeset	772 {
82 82679cccaa32 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	773 case 'n': fputc('\n', outFile); break;
82679cccaa32 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	774 case 'r': fputc('\r', outFile); break;
82679cccaa32 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	775 case 't': fputc('\r', outFile); break;
82679cccaa32 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	776 case '\\': fputc('\\', outFile); break;
82679cccaa32 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	777 default: fputc(*str, outFile); break;
62 0d01efc3c803 Factor escape printing to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 61 diff changeset	778 }
0d01efc3c803 Factor escape printing to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 61 diff changeset	779 else
0d01efc3c803 Factor escape printing to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 61 diff changeset	780 fputc(*str, outFile);
0d01efc3c803 Factor escape printing to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 61 diff changeset	781
0d01efc3c803 Factor escape printing to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 61 diff changeset	782 str++;
0d01efc3c803 Factor escape printing to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 61 diff changeset	783 }
0d01efc3c803 Factor escape printing to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 61 diff changeset	784 }
0d01efc3c803 Factor escape printing to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 61 diff changeset	785
0d01efc3c803 Factor escape printing to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 61 diff changeset	786
89 d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	787 static void siPrintFieldPrefix(FILE outFile, const PSFOption opt)
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	788 {
89 d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	789 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	790 if (!optNoNamePrefix && optFieldOutput)
29 d4ec69beb160 Add one line output format. Matti Hamalainen <ccr@tnsp.org> parents: 28 diff changeset	791 fprintf(outFile, optParsable ? "%s=" : "%-20s : ", name);
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	792 }
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	793
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	794
33 39d9df17c8b1 Add field separator argument to -l option. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	795 static void siPrintFieldSeparator(FILE *outFile)
39d9df17c8b1 Add field separator argument to -l option. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	796 {
111 c7ecf56d23e7 Rename a variable. Matti Hamalainen <ccr@tnsp.org> parents: 110 diff changeset	797 if (optFieldOutput)
83 c54d74312080 Fix some warnings. Matti Hamalainen <ccr@tnsp.org> parents: 82 diff changeset	798 fputs(optOneLine ? optFieldSep : "\n", outFile);
33 39d9df17c8b1 Add field separator argument to -l option. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	799 }
39d9df17c8b1 Add field separator argument to -l option. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	800
39d9df17c8b1 Add field separator argument to -l option. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	801
157 8fc887cb56d0 Implement iconv support for converting from PSID de-facto latin-1/ISO-8859-* Matti Hamalainen <ccr@tnsp.org> parents: 156 diff changeset	802 static void siPrintPSIDInfoLine(FILE outFile, BOOL shown, const PSFStackItem item, const char d_str, const int d_int, const BOOL useConv)
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	803 {
146 263cd25749a1 Simplify data printing. Matti Hamalainen <ccr@tnsp.org> parents: 145 diff changeset	804 const PSFOption *opt = &optPSOptions[item->cmd];
176 2e890e3d5684 Add functionality for escaping the separator characters (-l <str> option) in printed out string data. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	805 char fmt, str, *tmp;
146 263cd25749a1 Simplify data printing. Matti Hamalainen <ccr@tnsp.org> parents: 145 diff changeset	806
263cd25749a1 Simplify data printing. Matti Hamalainen <ccr@tnsp.org> parents: 145 diff changeset	807 switch (opt->type)
263cd25749a1 Simplify data printing. Matti Hamalainen <ccr@tnsp.org> parents: 145 diff changeset	808 {
263cd25749a1 Simplify data printing. Matti Hamalainen <ccr@tnsp.org> parents: 145 diff changeset	809 case OTYPE_INT:
147 f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	810 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	811 fmt = item->fmt;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	812 else
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	813 fmt = optHexadecimal ? "$%04x" : "%d";
146 263cd25749a1 Simplify data printing. Matti Hamalainen <ccr@tnsp.org> parents: 145 diff changeset	814 break;
263cd25749a1 Simplify data printing. Matti Hamalainen <ccr@tnsp.org> parents: 145 diff changeset	815
263cd25749a1 Simplify data printing. Matti Hamalainen <ccr@tnsp.org> parents: 145 diff changeset	816 case OTYPE_STR:
147 f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	817 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	818 fmt = item->fmt;
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	819 else
f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	820 fmt = "%s";
155 de75385f75e2 Simplify by removing few lines of duplicate code. Matti Hamalainen <ccr@tnsp.org> parents: 153 diff changeset	821 break;
147 f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	822
155 de75385f75e2 Simplify by removing few lines of duplicate code. Matti Hamalainen <ccr@tnsp.org> parents: 153 diff changeset	823 default:
de75385f75e2 Simplify by removing few lines of duplicate code. Matti Hamalainen <ccr@tnsp.org> parents: 153 diff changeset	824 return;
146 263cd25749a1 Simplify data printing. Matti Hamalainen <ccr@tnsp.org> parents: 145 diff changeset	825 }
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	826
109 59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	827 siPrintFieldPrefix(outFile, opt);
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	828
157 8fc887cb56d0 Implement iconv support for converting from PSID de-facto latin-1/ISO-8859-* Matti Hamalainen <ccr@tnsp.org> parents: 156 diff changeset	829 #ifdef HAVE_ICONV
8fc887cb56d0 Implement iconv support for converting from PSID de-facto latin-1/ISO-8859-* Matti Hamalainen <ccr@tnsp.org> parents: 156 diff changeset	830 if (setUseChConv && d_str != NULL && useConv)
176 2e890e3d5684 Add functionality for escaping the separator characters (-l <str> option) in printed out string data. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	831 {
2e890e3d5684 Add functionality for escaping the separator characters (-l <str> option) in printed out string data. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	832 char *tmp2 = siConvertCharset(setChConv, d_str);
2e890e3d5684 Add functionality for escaping the separator characters (-l <str> option) in printed out string data. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	833 tmp = siEscapeString(tmp2, optFieldSep);
2e890e3d5684 Add functionality for escaping the separator characters (-l <str> option) in printed out string data. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	834 th_free(tmp2);
2e890e3d5684 Add functionality for escaping the separator characters (-l <str> option) in printed out string data. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	835 }
157 8fc887cb56d0 Implement iconv support for converting from PSID de-facto latin-1/ISO-8859-* Matti Hamalainen <ccr@tnsp.org> parents: 156 diff changeset	836 else
176 2e890e3d5684 Add functionality for escaping the separator characters (-l <str> option) in printed out string data. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	837 tmp = siEscapeString(d_str, optFieldSep);
157 8fc887cb56d0 Implement iconv support for converting from PSID de-facto latin-1/ISO-8859-* Matti Hamalainen <ccr@tnsp.org> parents: 156 diff changeset	838 #else
8fc887cb56d0 Implement iconv support for converting from PSID de-facto latin-1/ISO-8859-* Matti Hamalainen <ccr@tnsp.org> parents: 156 diff changeset	839 (void) useConv;
176 2e890e3d5684 Add functionality for escaping the separator characters (-l <str> option) in printed out string data. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	840 tmp = siEscapeString(d_str, optFieldSep);
157 8fc887cb56d0 Implement iconv support for converting from PSID de-facto latin-1/ISO-8859-* Matti Hamalainen <ccr@tnsp.org> parents: 156 diff changeset	841 #endif
8fc887cb56d0 Implement iconv support for converting from PSID de-facto latin-1/ISO-8859-* Matti Hamalainen <ccr@tnsp.org> parents: 156 diff changeset	842
176 2e890e3d5684 Add functionality for escaping the separator characters (-l <str> option) in printed out string data. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	843 if ((str = siItemFormatStrPrint(fmt, opt, tmp, d_int)) != NULL)
146 263cd25749a1 Simplify data printing. Matti Hamalainen <ccr@tnsp.org> parents: 145 diff changeset	844 fputs(str, outFile);
3 dbe35d78e621 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	845
109 59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	846 siPrintFieldSeparator(outFile);
146 263cd25749a1 Simplify data printing. Matti Hamalainen <ccr@tnsp.org> parents: 145 diff changeset	847 th_free(str);
157 8fc887cb56d0 Implement iconv support for converting from PSID de-facto latin-1/ISO-8859-* Matti Hamalainen <ccr@tnsp.org> parents: 156 diff changeset	848 th_free(tmp);
8fc887cb56d0 Implement iconv support for converting from PSID de-facto latin-1/ISO-8859-* Matti Hamalainen <ccr@tnsp.org> parents: 156 diff changeset	849
109 59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	850 *shown = TRUE;
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	851 }
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	852
89 d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	853
157 8fc887cb56d0 Implement iconv support for converting from PSID de-facto latin-1/ISO-8859-* Matti Hamalainen <ccr@tnsp.org> parents: 156 diff changeset	854 #define PRS(d_str, d_conv) siPrintPSIDInfoLine(outFile, shown, item, d_str, -1, d_conv)
8fc887cb56d0 Implement iconv support for converting from PSID de-facto latin-1/ISO-8859-* Matti Hamalainen <ccr@tnsp.org> parents: 156 diff changeset	855 #define PRI(d_int) siPrintPSIDInfoLine(outFile, shown, item, NULL, d_int, FALSE)
9 c1fba4abf56f Make filename printing optional. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	856
59 718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	857
114 cc74a9871a44 Simplify. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	858 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	859 {
114 cc74a9871a44 Simplify. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	860 const PSFOption *opt = &optPSOptions[item->cmd];
150 0288c4d138f7 Make the hash field also formattable. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	861 char tmp[128];
146 263cd25749a1 Simplify data printing. Matti Hamalainen <ccr@tnsp.org> parents: 145 diff changeset	862
114 cc74a9871a44 Simplify. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	863 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	864 {
156 717d143612e2 Simplify things by having separate PRS/PRI macros for printing string and Matti Hamalainen <ccr@tnsp.org> parents: 155 diff changeset	865 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	866 case 1: PRS(psid->magic, FALSE); break;
146 263cd25749a1 Simplify data printing. Matti Hamalainen <ccr@tnsp.org> parents: 145 diff changeset	867 case 2:
263cd25749a1 Simplify data printing. Matti Hamalainen <ccr@tnsp.org> parents: 145 diff changeset	868 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	869 PRS(tmp, FALSE);
146 263cd25749a1 Simplify data printing. Matti Hamalainen <ccr@tnsp.org> parents: 145 diff changeset	870 break;
263cd25749a1 Simplify data printing. Matti Hamalainen <ccr@tnsp.org> parents: 145 diff changeset	871 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	872 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	873 break;
55 54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	874 case 4:
54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	875 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	876 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	877 break;
54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	878 case 5:
54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	879 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	880 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	881 break;
54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	882 case 6:
54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	883 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	884 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	885 break;
35 79e6d08b473f Add more information fields, including SID model, video clock speed, etc. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	886
156 717d143612e2 Simplify things by having separate PRS/PRI macros for printing string and Matti Hamalainen <ccr@tnsp.org> parents: 155 diff changeset	887 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	888 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	889 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	890 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	891 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	892 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	893 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	894
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	895 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	896 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	897 {
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	898 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	899 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	900 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	901
156 717d143612e2 Simplify things by having separate PRS/PRI macros for printing string and Matti Hamalainen <ccr@tnsp.org> parents: 155 diff changeset	902 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	903 }
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	904 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	905 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	906 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	907 {
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	908 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	909 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	910 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	911
156 717d143612e2 Simplify things by having separate PRS/PRI macros for printing string and Matti Hamalainen <ccr@tnsp.org> parents: 155 diff changeset	912 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	913 }
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	914 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	915 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	916 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	917 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	918 break;
55 54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	919 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	920 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	921 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	922 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	923
156 717d143612e2 Simplify things by having separate PRS/PRI macros for printing string and Matti Hamalainen <ccr@tnsp.org> parents: 155 diff changeset	924 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	925 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	926 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	927
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	928 case 21:
140 9f96b37c4f75 Don't print songlengths field if there are none. Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	929 {
150 0288c4d138f7 Make the hash field also formattable. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	930 size_t i, k;
0288c4d138f7 Make the hash field also formattable. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	931 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	932 sprintf(&tmp[k], "%02x", psid->hash[i]);
0288c4d138f7 Make the hash field also formattable. Matti Hamalainen <ccr@tnsp.org> parents: 148 diff changeset	933
156 717d143612e2 Simplify things by having separate PRS/PRI macros for printing string and Matti Hamalainen <ccr@tnsp.org> parents: 155 diff changeset	934 PRS(tmp, FALSE);
140 9f96b37c4f75 Don't print songlengths field if there are none. Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	935 }
55 54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	936 break;
89 d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	937
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	938 case 22:
142 da29f147afcb Better check for number of songlengths. Matti Hamalainen <ccr@tnsp.org> parents: 141 diff changeset	939 if (psid->lengths != NULL && psid->lengths->nlengths > 0)
89 d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	940 {
114 cc74a9871a44 Simplify. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	941 int i;
140 9f96b37c4f75 Don't print songlengths field if there are none. Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	942 siPrintFieldPrefix(outFile, opt);
114 cc74a9871a44 Simplify. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	943 for (i = 0; i < psid->lengths->nlengths; i++)
89 d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	944 {
114 cc74a9871a44 Simplify. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	945 int len = psid->lengths->lengths[i];
cc74a9871a44 Simplify. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	946 fprintf(outFile, "%d:%d%s", len / 60, len % 60,
cc74a9871a44 Simplify. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	947 (i < psid->lengths->nlengths - 1) ? " " : "");
89 d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	948 }
140 9f96b37c4f75 Don't print songlengths field if there are none. Matti Hamalainen <ccr@tnsp.org> parents: 138 diff changeset	949 siPrintFieldSeparator(outFile);
89 d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	950 }
d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	951 break;
29 d4ec69beb160 Add one line output format. Matti Hamalainen <ccr@tnsp.org> parents: 28 diff changeset	952 }
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	953 }
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	954
0 8e7e08bf7b9e Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	955
19 16cfbdf20eaf Handle multiple files. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	956 BOOL argHandleFile(char *filename)
16cfbdf20eaf Handle multiple files. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	957 {
126 c1462b7880e8 Make si_read_sid_file() to allocate the PSIDHeader struct itself, adjust Matti Hamalainen <ccr@tnsp.org> parents: 125 diff changeset	958 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	959 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	960 FILE *outFile;
55 54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	961 BOOL shown = FALSE;
54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	962
19 16cfbdf20eaf Handle multiple files. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	963 optNFiles++;
55 54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	964 outFile = stdout;
19 16cfbdf20eaf Handle multiple files. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	965
85 4c0ecb078591 Rename various variables and functions and change relevant places to use the Matti Hamalainen <ccr@tnsp.org> parents: 83 diff changeset	966 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	967 {
16cfbdf20eaf Handle multiple files. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	968 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	969 goto error;
19 16cfbdf20eaf Handle multiple files. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	970 }
16cfbdf20eaf Handle multiple files. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	971
16cfbdf20eaf Handle multiple files. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	972 // Read PSID data
163 179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 161 diff changeset	973 if (!si_read_sid_file(inFile, &psid, setSLDBNewFormat))
23 832c26cb1637 Improve option handling. Matti Hamalainen <ccr@tnsp.org> parents: 21 diff changeset	974 {
832c26cb1637 Improve option handling. Matti Hamalainen <ccr@tnsp.org> parents: 21 diff changeset	975 THERR("Error reading %s\n", filename);
19 16cfbdf20eaf Handle multiple files. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	976 goto error;
23 832c26cb1637 Improve option handling. Matti Hamalainen <ccr@tnsp.org> parents: 21 diff changeset	977 }
19 16cfbdf20eaf Handle multiple files. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	978
89 d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	979 // Get songlength information, if any
d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	980 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	981 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	982
19 16cfbdf20eaf Handle multiple files. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	983 // Output
147 f636c55c7cc4 Implement C printf-style format specifiers for -F option @fields@. Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	984 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	985 {
109 59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	986 PSFStackItem *item = &optFormat.items[index];
59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	987 switch (item->cmd)
59 718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	988 {
109 59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	989 case -1:
59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	990 siPrintStrEscapes(outFile, item->str);
59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	991 break;
59 718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	992
109 59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	993 case -2:
59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	994 fputc(item->chr, outFile);
59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	995 break;
59 718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	996
109 59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	997 default:
126 c1462b7880e8 Make si_read_sid_file() to allocate the PSIDHeader struct itself, adjust Matti Hamalainen <ccr@tnsp.org> parents: 125 diff changeset	998 siPrintPSIDInformationField(outFile, filename, psid, &shown, item);
109 59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	999 break;
59 718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	1000 }
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	1001 }
153 e3be2ae6120e Delete trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 150 diff changeset	1002
111 c7ecf56d23e7 Rename a variable. Matti Hamalainen <ccr@tnsp.org> parents: 110 diff changeset	1003 if (optFieldOutput)
55 54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	1004 {
54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	1005 if (shown && optOneLine)
54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	1006 fprintf(outFile, "\n");
54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	1007 }
19 16cfbdf20eaf Handle multiple files. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	1008
16cfbdf20eaf Handle multiple files. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	1009 // Shutdown
16cfbdf20eaf Handle multiple files. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	1010 error:
126 c1462b7880e8 Make si_read_sid_file() to allocate the PSIDHeader struct itself, adjust Matti Hamalainen <ccr@tnsp.org> parents: 125 diff changeset	1011 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	1012 th_io_free(inFile);
19 16cfbdf20eaf Handle multiple files. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	1013
16cfbdf20eaf Handle multiple files. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	1014 return TRUE;
16cfbdf20eaf Handle multiple files. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	1015 }
16cfbdf20eaf Handle multiple files. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	1016
16cfbdf20eaf Handle multiple files. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	1017
0 8e7e08bf7b9e Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1018 int main(int argc, char *argv[])
8e7e08bf7b9e Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1019 {
8e7e08bf7b9e Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1020 // Initialize
174 e203761c4007 Bump version. Matti Hamalainen <ccr@tnsp.org> parents: 173 diff changeset	1021 th_init("SIDInfo", "PSID/RSID information displayer", "0.7.4",
173 23dcc2dc47a9 Add the license into the program itself, displayable via --license option. Matti Hamalainen <ccr@tnsp.org> parents: 172 diff changeset	1022 "By Matti 'ccr' Hamalainen (C) Copyright 2014-2018 TNSP",
23dcc2dc47a9 Add the license into the program itself, displayable via --license option. Matti Hamalainen <ccr@tnsp.org> parents: 172 diff changeset	1023 "This program is distributed under a 3-clause BSD -style license.");
23dcc2dc47a9 Add the license into the program itself, displayable via --license option. Matti Hamalainen <ccr@tnsp.org> parents: 172 diff changeset	1024
172 6dcf4ca1dce7 Change to match th-libs' verbosity level changes. Matti Hamalainen <ccr@tnsp.org> parents: 171 diff changeset	1025 th_verbosity = 0;
0 8e7e08bf7b9e Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1026
59 718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	1027 memset(&optFormat, 0, sizeof(optFormat));
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	1028
120 ecbc8cabd6a2 Initial work on iconv support. Matti Hamalainen <ccr@tnsp.org> parents: 118 diff changeset	1029 // 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	1030 #ifdef HAVE_ICONV
b4b1aac8761c Add preprocessor guards around iconv stuff. Matti Hamalainen <ccr@tnsp.org> parents: 134 diff changeset	1031 char *setLang = th_strdup(getenv("LANG"));
120 ecbc8cabd6a2 Initial work on iconv support. Matti Hamalainen <ccr@tnsp.org> parents: 118 diff changeset	1032 if (setLang != NULL)
ecbc8cabd6a2 Initial work on iconv support. Matti Hamalainen <ccr@tnsp.org> parents: 118 diff changeset	1033 {
ecbc8cabd6a2 Initial work on iconv support. Matti Hamalainen <ccr@tnsp.org> parents: 118 diff changeset	1034 char *ptr = strchr(setLang, '.');
ecbc8cabd6a2 Initial work on iconv support. Matti Hamalainen <ccr@tnsp.org> parents: 118 diff changeset	1035 if (ptr != NULL) strcpy(setLang, ptr + 1);
ecbc8cabd6a2 Initial work on iconv support. Matti Hamalainen <ccr@tnsp.org> parents: 118 diff changeset	1036 }
ecbc8cabd6a2 Initial work on iconv support. Matti Hamalainen <ccr@tnsp.org> parents: 118 diff changeset	1037
129 abed2715ea68 Fix iconv initialization. Matti Hamalainen <ccr@tnsp.org> parents: 127 diff changeset	1038 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	1039 setUseChConv = setChConv != (iconv_t) -1;
ecbc8cabd6a2 Initial work on iconv support. Matti Hamalainen <ccr@tnsp.org> parents: 118 diff changeset	1040 th_free(setLang);
135 b4b1aac8761c Add preprocessor guards around iconv stuff. Matti Hamalainen <ccr@tnsp.org> parents: 134 diff changeset	1041 #endif
120 ecbc8cabd6a2 Initial work on iconv support. Matti Hamalainen <ccr@tnsp.org> parents: 118 diff changeset	1042
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	1043 // Parse command line arguments
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	1044 if (!th_args_process(argc, argv, optList, optListN,
23 832c26cb1637 Improve option handling. Matti Hamalainen <ccr@tnsp.org> parents: 21 diff changeset	1045 argHandleOpt, argHandleFile, OPTH_ONLY_OPTS))
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	1046 return -1;
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	1047
29 d4ec69beb160 Add one line output format. Matti Hamalainen <ccr@tnsp.org> parents: 28 diff changeset	1048 if (optOneLine)
d4ec69beb160 Add one line output format. Matti Hamalainen <ccr@tnsp.org> parents: 28 diff changeset	1049 {
161 58fe784a6e48 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 158 diff changeset	1050 // For one-line format, disable parsing and prefixes
29 d4ec69beb160 Add one line output format. Matti Hamalainen <ccr@tnsp.org> parents: 28 diff changeset	1051 optParsable = FALSE;
d4ec69beb160 Add one line output format. Matti Hamalainen <ccr@tnsp.org> parents: 28 diff changeset	1052 optNoNamePrefix = TRUE;
d4ec69beb160 Add one line output format. Matti Hamalainen <ccr@tnsp.org> parents: 28 diff changeset	1053 }
153 e3be2ae6120e Delete trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 150 diff changeset	1054
161 58fe784a6e48 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 158 diff changeset	1055 if (optFieldOutput && optFormat.nitems == 0)
109 59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	1056 {
161 58fe784a6e48 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 158 diff changeset	1057 // For standard field output, push standard items to format stack
115 6843261b4cd6 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	1058 PSFStackItem item;
127 1786b9d77782 Rename a variable, cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	1059
115 6843261b4cd6 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	1060 memset(&item, 0, sizeof(item));
109 59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	1061 siClearStack(&optFormat);
127 1786b9d77782 Rename a variable, cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	1062
161 58fe784a6e48 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 158 diff changeset	1063 for (int i = 0; i < noptPSOptions; i++)
109 59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	1064 {
59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	1065 item.cmd = i;
59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	1066 siStackAddItem(&optFormat, &item);
59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	1067 }
59b5b99f4280 Reimplement '-f' option differently. Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	1068 }
29 d4ec69beb160 Add one line output format. Matti Hamalainen <ccr@tnsp.org> parents: 28 diff changeset	1069
90 2ab9ab4b59eb Some fixes. Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	1070 // Check paths
89 d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	1071 if (setHVSCPath != NULL)
d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	1072 {
d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	1073 if (setSLDBPath == NULL)
d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	1074 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	1075 }
d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	1076
d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	1077 if (setSLDBPath != NULL)
d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	1078 {
d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	1079 // Initialize SLDB
110 e9dbedc4d5e4 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 109 diff changeset	1080 int ret = THERR_OK;
127 1786b9d77782 Rename a variable, cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	1081 th_ioctx *inFile = NULL;
1786b9d77782 Rename a variable, cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	1082 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	1083 {
106 9ff4f6da3db8 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 94 diff changeset	1084 THERR("Could not open SLDB '%s'.\n",
9ff4f6da3db8 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 94 diff changeset	1085 setSLDBPath);
110 e9dbedc4d5e4 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 109 diff changeset	1086 goto err;
89 d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	1087 }
d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	1088
115 6843261b4cd6 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	1089 THMSG(1, "Reading SLDB.\n");
110 e9dbedc4d5e4 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 109 diff changeset	1090 if ((sidSLDB = si_sldb_new()) == NULL)
e9dbedc4d5e4 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 109 diff changeset	1091 {
e9dbedc4d5e4 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 109 diff changeset	1092 THERR("Could not allocate SLDB structure!\n");
e9dbedc4d5e4 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 109 diff changeset	1093 goto err;
e9dbedc4d5e4 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 109 diff changeset	1094 }
e9dbedc4d5e4 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 109 diff changeset	1095
127 1786b9d77782 Rename a variable, cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	1096 if ((ret = si_sldb_read(inFile, sidSLDB)) != THERR_OK)
89 d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	1097 {
106 9ff4f6da3db8 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 94 diff changeset	1098 THERR("Error parsing SLDB: %d, %s\n",
9ff4f6da3db8 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 94 diff changeset	1099 ret, th_error_str(ret));
110 e9dbedc4d5e4 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 109 diff changeset	1100 goto err;
89 d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	1101 }
127 1786b9d77782 Rename a variable, cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	1102 th_io_close(inFile);
89 d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	1103
d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	1104 if ((ret = si_sldb_build_index(sidSLDB)) != THERR_OK)
d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	1105 {
106 9ff4f6da3db8 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 94 diff changeset	1106 THERR("Error building SLDB index: %d, %s.\n",
9ff4f6da3db8 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 94 diff changeset	1107 ret, th_error_str(ret));
110 e9dbedc4d5e4 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 109 diff changeset	1108 goto err;
89 d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	1109 }
110 e9dbedc4d5e4 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 109 diff changeset	1110
163 179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 161 diff changeset	1111 setSLDBNewFormat = th_strrcasecmp(setSLDBPath, ".md5") != NULL;
179ffe97599c Implement support for the "new" MD5 format of SLDB. Matti Hamalainen <ccr@tnsp.org> parents: 161 diff changeset	1112
110 e9dbedc4d5e4 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 109 diff changeset	1113 err:
127 1786b9d77782 Rename a variable, cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	1114 th_io_close(inFile);
89 d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	1115 }
d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	1116
23 832c26cb1637 Improve option handling. Matti Hamalainen <ccr@tnsp.org> parents: 21 diff changeset	1117 // Process files
832c26cb1637 Improve option handling. Matti Hamalainen <ccr@tnsp.org> parents: 21 diff changeset	1118 if (!th_args_process(argc, argv, optList, optListN,
832c26cb1637 Improve option handling. Matti Hamalainen <ccr@tnsp.org> parents: 21 diff changeset	1119 argHandleOpt, argHandleFile, OPTH_ONLY_OTHER))
89 d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	1120 goto out;
23 832c26cb1637 Improve option handling. Matti Hamalainen <ccr@tnsp.org> parents: 21 diff changeset	1121
19 16cfbdf20eaf Handle multiple files. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	1122 if (optNFiles == 0)
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	1123 {
141 71725be55ed1 Do not show full help if no filenames are specified. Matti Hamalainen <ccr@tnsp.org> parents: 140 diff changeset	1124 THERR("No filename(s) specified. Try --help.\n");
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	1125 }
1 25a3a142e909 Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	1126
89 d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	1127 out:
d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	1128
135 b4b1aac8761c Add preprocessor guards around iconv stuff. Matti Hamalainen <ccr@tnsp.org> parents: 134 diff changeset	1129 #ifdef HAVE_ICONV
120 ecbc8cabd6a2 Initial work on iconv support. Matti Hamalainen <ccr@tnsp.org> parents: 118 diff changeset	1130 if (setUseChConv)
ecbc8cabd6a2 Initial work on iconv support. Matti Hamalainen <ccr@tnsp.org> parents: 118 diff changeset	1131 iconv_close(setChConv);
135 b4b1aac8761c Add preprocessor guards around iconv stuff. Matti Hamalainen <ccr@tnsp.org> parents: 134 diff changeset	1132 #endif
120 ecbc8cabd6a2 Initial work on iconv support. Matti Hamalainen <ccr@tnsp.org> parents: 118 diff changeset	1133
89 d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	1134 th_free(setHVSCPath);
d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	1135 th_free(setSLDBPath);
d9cb7c635e7b Implement initial SLDB support. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	1136 si_sldb_free(sidSLDB);
19 16cfbdf20eaf Handle multiple files. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	1137 return 0;
0 8e7e08bf7b9e Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1138 }

Mercurial > hg > sidinfo

annotate sidinfo.c @ 176:2e890e3d5684