sidinfo: sidinfo.c annotate

annotate sidinfo.c @ 157:8fc887cb56d0

Implement iconv support for converting from PSID de-facto latin-1/ISO-8859-* to whatever we are using currently (default to UTF-8). Support for iconv can be turned off via compile-time define (see Makefile).

author	Matti Hamalainen <ccr@tnsp.org>
date	Thu, 26 Oct 2017 01:46:34 +0300
parents	717d143612e2
children	a8c24f1f460f

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

Mercurial > hg > sidinfo

annotate sidinfo.c @ 157:8fc887cb56d0