sidinfo: sidinfo.c annotate

annotate sidinfo.c @ 70:4779bbec2f28

Split some functionality into sidlib.[ch].

author	Matti Hamalainen <ccr@tnsp.org>
date	Fri, 01 Jan 2016 03:32:42 +0200
parents	6bbe11ae6bf5
children	2b2376f1b0cc

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
70 4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	3 * Written by Matti 'ccr' Hämäläinen <ccr@tnsp.org>
56 d2148880c71e Update copyright year. Matti Hamalainen <ccr@tnsp.org> parents: 55 diff changeset	4 * (C) Copyright 2014-2015 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"
70 4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	8 #include "sidlib.h"
4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	9
0 8e7e08bf7b9e Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	10
28 6240788fe172 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	11 // Some constants
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	12 #define PSID_MAGIC_LEN 4
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	13 #define PSID_STR_LEN 32
1 25a3a142e909 Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	14 #define PSID_BUFFER_SIZE (1024 * 16)
25a3a142e909 Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	15
0 8e7e08bf7b9e Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	16
28 6240788fe172 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	17 // Flags for various information fields
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	18 enum
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	19 {
35 79e6d08b473f Add more information fields, including SID model, video clock speed, etc. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	20 SIF_NONE = 0,
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	21
35 79e6d08b473f Add more information fields, including SID model, video clock speed, etc. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	22 SIF_TYPE = 0x00000001,
79e6d08b473f Add more information fields, including SID model, video clock speed, etc. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	23 SIF_VERSION = 0x00000002,
79e6d08b473f Add more information fields, including SID model, video clock speed, etc. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	24 SIF_DATA_OFFS = 0x00000004,
79e6d08b473f Add more information fields, including SID model, video clock speed, etc. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	25 SIF_LOAD_ADDR = 0x00000008,
79e6d08b473f Add more information fields, including SID model, video clock speed, etc. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	26 SIF_INIT_ADDR = 0x00000010,
79e6d08b473f Add more information fields, including SID model, video clock speed, etc. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	27 SIF_PLAY_ADDR = 0x00000020,
79e6d08b473f Add more information fields, including SID model, video clock speed, etc. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	28 SIF_SONGS = 0x00000040,
79e6d08b473f Add more information fields, including SID model, video clock speed, etc. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	29 SIF_START_SONG = 0x00000080,
79e6d08b473f Add more information fields, including SID model, video clock speed, etc. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	30 SIF_SPEEDS = 0x00000100,
79e6d08b473f Add more information fields, including SID model, video clock speed, etc. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	31 SIF_SID_NAME = 0x00000200,
79e6d08b473f Add more information fields, including SID model, video clock speed, etc. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	32 SIF_SID_AUTHOR = 0x00000400,
79e6d08b473f Add more information fields, including SID model, video clock speed, etc. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	33 SIF_SID_COPYRIGHT = 0x00000800,
79e6d08b473f Add more information fields, including SID model, video clock speed, etc. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	34 SIF_PLAYER_TYPE = 0x00001000,
79e6d08b473f Add more information fields, including SID model, video clock speed, etc. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	35 SIF_PLAYSID_TUNE = 0x00002000,
79e6d08b473f Add more information fields, including SID model, video clock speed, etc. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	36 SIF_VIDEO_CLOCK = 0x00004000,
79e6d08b473f Add more information fields, including SID model, video clock speed, etc. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	37 SIF_SID_MODEL = 0x00008000,
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	38
35 79e6d08b473f Add more information fields, including SID model, video clock speed, etc. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	39 SIF_DATA_SIZE = 0x00100000,
79e6d08b473f Add more information fields, including SID model, video clock speed, etc. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	40 SIF_HASH = 0x00200000,
51 485c8ed6d3fe Portability fix. Matti Hamalainen <ccr@tnsp.org> parents: 50 diff changeset	41 SIF_FILENAME = 0x01000000,
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	42
51 485c8ed6d3fe Portability fix. Matti Hamalainen <ccr@tnsp.org> parents: 50 diff changeset	43 SIF_ALL = 0x0fffffff,
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	44 };
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	45
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	46
0 8e7e08bf7b9e Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	47 typedef struct
8e7e08bf7b9e Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	48 {
63 6bbe11ae6bf5 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	49 int cmd;
6bbe11ae6bf5 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	50 char *str;
6bbe11ae6bf5 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	51 char chr;
6bbe11ae6bf5 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	52 } PSFStackItem;
6bbe11ae6bf5 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	53
6bbe11ae6bf5 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	54
6bbe11ae6bf5 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	55 typedef struct
6bbe11ae6bf5 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	56 {
6bbe11ae6bf5 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	57 int nitems, nallocated;
6bbe11ae6bf5 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	58 PSFStackItem *items;
6bbe11ae6bf5 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	59 } PSFStack;
6bbe11ae6bf5 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	60
6bbe11ae6bf5 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	61
6bbe11ae6bf5 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	62 typedef struct
6bbe11ae6bf5 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	63 {
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	64 uint32_t flag;
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	65 char *name;
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	66 char *lname;
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	67 } PSFOption;
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	68
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	69
45 ed8c803a948c Static constify. Matti Hamalainen <ccr@tnsp.org> parents: 44 diff changeset	70 static const PSFOption optPSFlags[] =
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	71 {
55 54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	72 { SIF_FILENAME , "Filename" , NULL },
35 79e6d08b473f Add more information fields, including SID model, video clock speed, etc. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	73 { SIF_TYPE , "Type" , NULL },
79e6d08b473f Add more information fields, including SID model, video clock speed, etc. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	74 { SIF_VERSION , "Version" , NULL },
55 54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	75 { SIF_PLAYER_TYPE , "PlayerType" , "Player type" },
54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	76 { SIF_PLAYSID_TUNE , "PlayerCompat", "Player compatibility" },
54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	77 { SIF_VIDEO_CLOCK , "VideoClock" , "Video clock speed" },
54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	78 { SIF_SID_MODEL , "SIDModel" , "SID model" },
54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	79
35 79e6d08b473f Add more information fields, including SID model, video clock speed, etc. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	80 { SIF_DATA_OFFS , "DataOffs" , "Data offset" },
79e6d08b473f Add more information fields, including SID model, video clock speed, etc. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	81 { SIF_DATA_SIZE , "DataSize" , "Data size" },
79e6d08b473f Add more information fields, including SID model, video clock speed, etc. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	82 { SIF_LOAD_ADDR , "LoadAddr" , "Load address" },
79e6d08b473f Add more information fields, including SID model, video clock speed, etc. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	83 { SIF_INIT_ADDR , "InitAddr" , "Init address" },
79e6d08b473f Add more information fields, including SID model, video clock speed, etc. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	84 { SIF_PLAY_ADDR , "PlayAddr" , "Play address" },
79e6d08b473f Add more information fields, including SID model, video clock speed, etc. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	85 { SIF_SONGS , "Songs" , "Songs" },
79e6d08b473f Add more information fields, including SID model, video clock speed, etc. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	86 { SIF_START_SONG , "StartSong" , "Start song" },
79e6d08b473f Add more information fields, including SID model, video clock speed, etc. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	87 { SIF_SID_NAME , "Name" , NULL },
79e6d08b473f Add more information fields, including SID model, video clock speed, etc. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	88 { SIF_SID_AUTHOR , "Author" , NULL },
79e6d08b473f Add more information fields, including SID model, video clock speed, etc. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	89 { SIF_SID_COPYRIGHT , "Copyright" , NULL },
79e6d08b473f Add more information fields, including SID model, video clock speed, etc. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	90 { SIF_HASH , "Hash" , NULL },
28 6240788fe172 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	91
35 79e6d08b473f Add more information fields, including SID model, video clock speed, etc. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	92 { SIF_ALL , "All" , NULL },
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	93 };
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	94
45 ed8c803a948c Static constify. Matti Hamalainen <ccr@tnsp.org> parents: 44 diff changeset	95 static const int noptPSFlags = sizeof(optPSFlags) / sizeof(optPSFlags[0]);
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	96
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	97
28 6240788fe172 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	98 // Option variables
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	99 BOOL optParsable = FALSE,
7 36c43f085b28 Add NoPrefix option -n. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	100 optNoNamePrefix = FALSE,
29 d4ec69beb160 Add one line output format. Matti Hamalainen <ccr@tnsp.org> parents: 28 diff changeset	101 optHexadecimal = FALSE,
d4ec69beb160 Add one line output format. Matti Hamalainen <ccr@tnsp.org> parents: 28 diff changeset	102 optOneLine = FALSE;
55 54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	103 char *optFieldSep = NULL;
35 79e6d08b473f Add more information fields, including SID model, video clock speed, etc. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	104 uint32_t optFields = SIF_ALL;
19 16cfbdf20eaf Handle multiple files. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	105 int optNFiles = 0;
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	106
59 718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	107 PSFStack optFormat;
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	108
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	109
28 6240788fe172 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	110 // Define option arguments
44 7b137e4e817c Fix to match the changes in th_args API. Matti Hamalainen <ccr@tnsp.org> parents: 41 diff changeset	111 static const th_optarg_t optList[] =
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	112 {
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	113 { 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	114 // { 1, 'v', "verbose", "Be more verbose", OPT_NONE },
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	115 { 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	116 { 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	117 { 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	118 { 3, 'f', "fields", "Show only specified field(s)", OPT_ARGREQ },
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	119 { 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	120 { 7, 'F', "format", "Use given format string (see below)", OPT_ARGREQ },
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	121 };
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	122
44 7b137e4e817c Fix to match the changes in th_args API. Matti Hamalainen <ccr@tnsp.org> parents: 41 diff changeset	123 static const int optListN = sizeof(optList) / sizeof(optList[0]);
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	124
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	125
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	126 void argShowHelp(void)
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	127 {
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	128 int index, n;
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	129
20 6058339ffe0e Update usage. Matti Hamalainen <ccr@tnsp.org> parents: 19 diff changeset	130 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	131 th_args_help(stdout, optList, optListN, 0);
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	132 printf(
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	133 "\n"
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	134 "Available fields:\n");
3 dbe35d78e621 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	135
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	136 for (index = n = 0; index < noptPSFlags; index++)
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	137 {
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	138 const PSFOption *opt = &optPSFlags[index];
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	139 printf("%s%s", opt->name, (index < noptPSFlags - 1) ? ", " : "\n\n");
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	140 if (++n > 5)
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	141 {
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	142 printf("\n");
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	143 n = 0;
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	144 }
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	145 }
58 5ea07110f0cf Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 57 diff changeset	146
59 718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	147 printf(
61 6916aaeda941 Improve help. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	148 "Example: %s -x -p -f hash,copyright somesidfile.sid\n"
6916aaeda941 Improve help. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	149 "\n"
6916aaeda941 Improve help. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	150 "Format strings for '-F' option are composed of @fields@ that\n"
6916aaeda941 Improve help. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	151 "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	152 "can be used: -F \"hash=@hash@\\ncopy=@copyright@\\n\"\n"
6916aaeda941 Improve help. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	153 , th_prog_name);
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	154 }
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	155
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	156
59 718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	157 int argMatchPSField(const char *field, const size_t len)
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	158 {
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	159 int index, found = -1;
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	160 for (index = 0; index < noptPSFlags; index++)
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	161 {
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	162 const PSFOption *opt = &optPSFlags[index];
48 af1e12c8ebf1 Use th_strncasecmp(). Matti Hamalainen <ccr@tnsp.org> parents: 46 diff changeset	163 if (th_strncasecmp(opt->name, field, len) == 0)
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	164 {
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	165 if (found >= 0)
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	166 return -2;
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	167 found = index;
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
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	171 return found;
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
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	174
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	175 BOOL argParsePSField(char opt, char end, uint32_t *fields)
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	176 {
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	177 // Trim whitespace
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	178 if (end != NULL)
59 718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	179 while (end > opt && end && th_isspace(end)) end--;
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	180
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	181 while (opt && th_isspace(opt)) opt++;
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 // Match field name
59 718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	184 int found = argMatchPSField(opt, (end != NULL) ? end - opt : strlen(opt));
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	185 switch (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 case -1:
55 54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	188 THERR("No such field '%s'.\n", opt);
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	189 return FALSE;
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	190
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	191 case -2:
55 54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	192 THERR("Field '%s' is ambiguous.\n", opt);
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	193 return FALSE;
3 dbe35d78e621 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	194
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	195 default:
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	196 *fields \|= optPSFlags[found].flag;
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	197 return TRUE;
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	198 }
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	199 }
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	200
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	201
59 718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	202 BOOL siStackAddItem(PSFStack stack, const PSFStackItem item)
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	203 {
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	204 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	205 {
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	206 stack->nallocated += 16;
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	207 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	208 {
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	209 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	210 return FALSE;
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	211 }
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	212 }
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	213
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	214 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	215 stack->nitems++;
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	216 return TRUE;
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
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	219
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	220 void siClearStack(PSFStack *stack)
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 if (stack != NULL)
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 if (stack->nitems > 0 && stack->items != NULL)
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 int n;
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	227 for (n = 0; n < stack->nitems; n++)
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	228 {
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	229 if (stack->items[n].cmd == -1)
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	230 th_free(stack->items[n].str);
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	231 }
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	232 th_free(stack->items);
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	233 }
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	234 memset(stack, 0, sizeof(PSFStack));
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 }
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
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	239 BOOL argParsePSFormatStr(const char *fmt)
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 PSFStackItem item;
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	242 const char *start;
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	243 int mode = 0;
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	244
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	245 siClearStack(&optFormat);
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	246
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	247 while (mode != -1)
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	248 switch (mode)
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	249 {
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	250 case 0:
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	251 if (*fmt == '@')
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	252 {
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	253 start = fmt + 1;
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	254 mode = 1;
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	255 }
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	256 else
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	257 {
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	258 start = fmt;
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	259 mode = 2;
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	260 }
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	261 fmt++;
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	262 break;
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	263
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	264 case 1:
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	265 if (*fmt == '@')
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	266 {
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	267 if (fmt - start == 0)
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	268 {
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	269 item.cmd = -2;
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	270 item.str = NULL;
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	271 item.chr = '@';
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	272 if (!siStackAddItem(&optFormat, &item))
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	273 return FALSE;
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	274 }
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	275 else
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	276 {
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	277 int ret = argMatchPSField(start, fmt - start);
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	278 if (ret >= 0)
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	279 {
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	280 item.cmd = ret;
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	281 item.str = NULL;
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	282 if (!siStackAddItem(&optFormat, &item))
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	283 return FALSE;
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	284 }
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	285 else
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	286 {
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	287 THERR("Foobar %d\n", ret);
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	288 return FALSE;
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	289 }
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	290 }
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	291 mode = 0;
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	292 }
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	293 else
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	294 if (*fmt == 0)
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	295 mode = -1;
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	296 fmt++;
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	297 break;
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	298
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	299 case 2:
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	300 if (fmt == 0 \|\| fmt == '@')
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	301 {
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	302 item.cmd = -1;
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	303 item.str = th_strndup(start, fmt - start);
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	304 if (!siStackAddItem(&optFormat, &item))
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	305 return FALSE;
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	306 mode = (*fmt == 0) ? -1 : 0;
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	307 }
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	308 else
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	309 fmt++;
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	310 break;
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	311 }
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	312
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	313 return TRUE;
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	314 }
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	315
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	316
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	317 BOOL argHandleOpt(const int optN, char optArg, char currArg)
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	318 {
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	319 switch (optN)
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	320 {
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	321 case 0:
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	322 argShowHelp();
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	323 exit(0);
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	324 break;
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	325
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	326 case 1:
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	327 th_verbosityLevel++;
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	328 break;
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	329
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	330 case 2:
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	331 optParsable = TRUE;
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	332 break;
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	333
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	334 case 3:
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	335 {
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	336 char *start = optArg;
35 79e6d08b473f Add more information fields, including SID model, video clock speed, etc. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	337 optFields = SIF_NONE;
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	338
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	339 while (*start)
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	340 {
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	341 char *end = strchr(start, ',');
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	342
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	343 if (!argParsePSField(start, end, &optFields))
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	344 return FALSE;
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	345
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	346 if (!end)
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	347 break;
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	348
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	349 start = end + 1;
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	350 }
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	351 }
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	352 break;
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	353
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	354 case 4:
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	355 optHexadecimal = TRUE;
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	356 break;
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	357
7 36c43f085b28 Add NoPrefix option -n. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	358 case 5:
36c43f085b28 Add NoPrefix option -n. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	359 optNoNamePrefix = TRUE;
36c43f085b28 Add NoPrefix option -n. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	360 break;
36c43f085b28 Add NoPrefix option -n. Matti Hamalainen <ccr@tnsp.org> parents: 5 diff changeset	361
29 d4ec69beb160 Add one line output format. Matti Hamalainen <ccr@tnsp.org> parents: 28 diff changeset	362 case 6:
d4ec69beb160 Add one line output format. Matti Hamalainen <ccr@tnsp.org> parents: 28 diff changeset	363 optOneLine = TRUE;
33 39d9df17c8b1 Add field separator argument to -l option. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	364 optFieldSep = optArg;
29 d4ec69beb160 Add one line output format. Matti Hamalainen <ccr@tnsp.org> parents: 28 diff changeset	365 break;
d4ec69beb160 Add one line output format. Matti Hamalainen <ccr@tnsp.org> parents: 28 diff changeset	366
59 718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	367 case 7:
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	368 if (!argParsePSFormatStr(optArg))
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	369 return FALSE;
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	370 break;
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	371
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	372 default:
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	373 THERR("Unknown option '%s'.\n", currArg);
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	374 return FALSE;
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	375 }
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	376
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	377 return TRUE;
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	378 }
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	379
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	380
62 0d01efc3c803 Factor escape printing to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 61 diff changeset	381 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	382 {
0d01efc3c803 Factor escape printing to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 61 diff changeset	383 while (*str)
0d01efc3c803 Factor escape printing to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 61 diff changeset	384 {
0d01efc3c803 Factor escape printing to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 61 diff changeset	385 if (*str == '\\')
0d01efc3c803 Factor escape printing to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 61 diff changeset	386 {
0d01efc3c803 Factor escape printing to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 61 diff changeset	387 str++;
0d01efc3c803 Factor escape printing to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 61 diff changeset	388 switch (*str)
0d01efc3c803 Factor escape printing to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 61 diff changeset	389 {
0d01efc3c803 Factor escape printing to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 61 diff changeset	390 case 'n': fputc('\n', outFile); break;
0d01efc3c803 Factor escape printing to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 61 diff changeset	391 case 'r': fputc('\r', outFile); break;
0d01efc3c803 Factor escape printing to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 61 diff changeset	392 case 't': fputc('\r', outFile); break;
0d01efc3c803 Factor escape printing to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 61 diff changeset	393 case '\\': fputc('\\', outFile); break;
0d01efc3c803 Factor escape printing to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 61 diff changeset	394 }
0d01efc3c803 Factor escape printing to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 61 diff changeset	395 }
0d01efc3c803 Factor escape printing to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 61 diff changeset	396 else
0d01efc3c803 Factor escape printing to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 61 diff changeset	397 fputc(*str, outFile);
0d01efc3c803 Factor escape printing to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 61 diff changeset	398
0d01efc3c803 Factor escape printing to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 61 diff changeset	399 str++;
0d01efc3c803 Factor escape printing to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 61 diff changeset	400 }
0d01efc3c803 Factor escape printing to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 61 diff changeset	401 }
0d01efc3c803 Factor escape printing to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 61 diff changeset	402
0d01efc3c803 Factor escape printing to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 61 diff changeset	403
31 727c012d5de4 Rename a function. Matti Hamalainen <ccr@tnsp.org> parents: 29 diff changeset	404 static void siPrintFieldPrefix(FILE outFile, const char name)
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	405 {
59 718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	406 if (!optNoNamePrefix && !optFormat.nitems)
29 d4ec69beb160 Add one line output format. Matti Hamalainen <ccr@tnsp.org> parents: 28 diff changeset	407 fprintf(outFile, optParsable ? "%s=" : "%-20s : ", name);
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	408 }
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	409
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	410
33 39d9df17c8b1 Add field separator argument to -l option. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	411 static void siPrintFieldSeparator(FILE *outFile)
39d9df17c8b1 Add field separator argument to -l option. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	412 {
59 718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	413 if (!optFormat.nitems)
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	414 fprintf(outFile, optOneLine ? optFieldSep : "\n");
33 39d9df17c8b1 Add field separator argument to -l option. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	415 }
39d9df17c8b1 Add field separator argument to -l option. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	416
39d9df17c8b1 Add field separator argument to -l option. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	417
29 d4ec69beb160 Add one line output format. Matti Hamalainen <ccr@tnsp.org> parents: 28 diff changeset	418 static void siPrintPSIDInfoLine(FILE outFile, BOOL shown, const int xindex, const char xfmt, const char xaltfmt, ...)
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	419 {
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	420 const PSFOption *opt = &optPSFlags[xindex];
59 718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	421 if (optFormat.nitems \|\| (optFields & opt->flag))
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	422 {
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	423 va_list ap;
29 d4ec69beb160 Add one line output format. Matti Hamalainen <ccr@tnsp.org> parents: 28 diff changeset	424 const char *fmt = optHexadecimal ? (xaltfmt != NULL ? xaltfmt : xfmt) : xfmt;
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	425
31 727c012d5de4 Rename a function. Matti Hamalainen <ccr@tnsp.org> parents: 29 diff changeset	426 siPrintFieldPrefix(outFile, (optParsable \|\| opt->lname == NULL) ? opt->name : opt->lname);
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	427
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	428 va_start(ap, xaltfmt);
57 c10c79c266d3 Remove useless code. Matti Hamalainen <ccr@tnsp.org> parents: 56 diff changeset	429 vfprintf(outFile, fmt, ap);
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	430 va_end(ap);
3 dbe35d78e621 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 2 diff changeset	431
33 39d9df17c8b1 Add field separator argument to -l option. Matti Hamalainen <ccr@tnsp.org> parents: 32 diff changeset	432 siPrintFieldSeparator(outFile);
29 d4ec69beb160 Add one line output format. Matti Hamalainen <ccr@tnsp.org> parents: 28 diff changeset	433 *shown = TRUE;
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	434 }
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	435 }
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	436
55 54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	437 #define PR(xfmt, xaltfmt, ...) siPrintPSIDInfoLine(outFile, shown, xindex, xfmt, xaltfmt, __VA_ARGS__ )
9 c1fba4abf56f Make filename printing optional. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	438
59 718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	439
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	440 static void siPrintPSIDInformationField(FILE outFile, const char filename, const PSIDHeader psid, BOOL shown, const int xindex)
55 54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	441 {
54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	442 switch (xindex)
35 79e6d08b473f Add more information fields, including SID model, video clock speed, etc. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	443 {
55 54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	444 case 0: PR("%s", NULL, filename); break;
54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	445 case 1: PR("%s", NULL, psid->magic); break;
54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	446 case 2: PR("%d.%d", NULL, (psid->version & 0xff), (psid->version >> 8)); break;
54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	447 case 3: PR("%s", NULL, (psid->flags & PSF_PLAYER_TYPE) ? "Compute! SIDPlayer MUS" : "Normal built-in"); break;
54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	448 case 4:
54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	449 if (psid->version >= 2)
54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	450 PR("%s", NULL, (psid->flags & PSF_PLAYSID_TUNE) ? "PlaySID" : "C64 compatible");
54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	451 break;
54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	452 case 5:
54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	453 if (psid->version >= 2)
54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	454 PR("%s", NULL, siGetSIDClockStr(psid->flags));
54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	455 break;
54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	456 case 6:
54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	457 if (psid->version >= 2)
54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	458 PR("%s", NULL, siGetSIDModelStr(psid->flags));
54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	459 break;
35 79e6d08b473f Add more information fields, including SID model, video clock speed, etc. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	460
55 54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	461 case 7: PR("%d", "$%08x", psid->dataOffset); break;
54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	462 case 8: PR("%d", "$%08x", psid->dataSize); break;
54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	463 case 9: PR("%d", "$%04x", psid->loadAddress); break;
54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	464 case 10: PR("%d", "$%04x", psid->initAddress); break;
54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	465 case 11: PR("%d", "$%04x", psid->playAddress); break;
54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	466 case 12: PR("%d", "$%04x", psid->nSongs); break;
54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	467 case 13: PR("%d", "$%04x", psid->startSong); break;
54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	468 case 14: PR("%s", NULL, psid->sidName); break;
54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	469 case 15: PR("%s", NULL, psid->sidAuthor); break;
54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	470 case 16: PR("%s", NULL, psid->sidCopyright); break;
35 79e6d08b473f Add more information fields, including SID model, video clock speed, etc. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	471
55 54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	472 case 17:
54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	473 {
54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	474 const PSFOption *opt = &optPSFlags[xindex];
59 718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	475 if (optFormat.nitems \|\| (optFields & opt->flag))
55 54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	476 {
54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	477 siPrintFieldPrefix(outFile, "Hash");
54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	478 th_md5_print(outFile, psid->hash);
54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	479 siPrintFieldSeparator(outFile);
54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	480 }
54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	481 }
54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	482 break;
29 d4ec69beb160 Add one line output format. Matti Hamalainen <ccr@tnsp.org> parents: 28 diff changeset	483 }
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	484 }
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	485
0 8e7e08bf7b9e Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	486
19 16cfbdf20eaf Handle multiple files. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	487 BOOL argHandleFile(char *filename)
16cfbdf20eaf Handle multiple files. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	488 {
16cfbdf20eaf Handle multiple files. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	489 static PSIDHeader psid;
55 54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	490 FILE inFile = NULL, outFile;
54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	491 int index;
54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	492 BOOL shown = FALSE;
54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	493
19 16cfbdf20eaf Handle multiple files. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	494 optNFiles++;
55 54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	495 outFile = stdout;
19 16cfbdf20eaf Handle multiple files. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	496
16cfbdf20eaf Handle multiple files. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	497 if ((inFile = fopen(filename, "rb")) == NULL)
16cfbdf20eaf Handle multiple files. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	498 {
16cfbdf20eaf Handle multiple files. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	499 THERR("Could not open file '%s'.\n", filename);
27 4dd463eebb74 Fix argument handling when file does not exist. Matti Hamalainen <ccr@tnsp.org> parents: 25 diff changeset	500 return TRUE;
19 16cfbdf20eaf Handle multiple files. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	501 }
16cfbdf20eaf Handle multiple files. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	502
16cfbdf20eaf Handle multiple files. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	503 // Read PSID data
16cfbdf20eaf Handle multiple files. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	504 if (siReadPSIDFile(inFile, &psid) != 0)
23 832c26cb1637 Improve option handling. Matti Hamalainen <ccr@tnsp.org> parents: 21 diff changeset	505 {
832c26cb1637 Improve option handling. Matti Hamalainen <ccr@tnsp.org> parents: 21 diff changeset	506 THERR("Error reading %s\n", filename);
19 16cfbdf20eaf Handle multiple files. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	507 goto error;
23 832c26cb1637 Improve option handling. Matti Hamalainen <ccr@tnsp.org> parents: 21 diff changeset	508 }
19 16cfbdf20eaf Handle multiple files. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	509
16cfbdf20eaf Handle multiple files. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	510 // Output
59 718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	511 if (optFormat.nitems)
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	512 {
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	513 for (index = 0; index < optFormat.nitems; index++)
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	514 {
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	515 PSFStackItem *item = &optFormat.items[index];
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	516 switch (item->cmd)
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	517 {
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	518 case -1:
62 0d01efc3c803 Factor escape printing to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 61 diff changeset	519 siPrintStrEscapes(outFile, item->str);
59 718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	520 break;
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	521
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	522 case -2:
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	523 fputc(item->chr, outFile);
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	524 break;
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	525
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	526 default:
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	527 siPrintPSIDInformationField(outFile, filename, &psid, &shown, item->cmd);
62 0d01efc3c803 Factor escape printing to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 61 diff changeset	528 break;
59 718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	529 }
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	530 }
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 else
55 54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	533 {
54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	534 for (index = 0; index < noptPSFlags - 1; index++)
54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	535 siPrintPSIDInformationField(outFile, filename, &psid, &shown, index);
59 718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	536
55 54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	537 if (shown && optOneLine)
54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	538 fprintf(outFile, "\n");
54b48086a1d0 Begin slight refactoring of how output is done. Matti Hamalainen <ccr@tnsp.org> parents: 53 diff changeset	539 }
19 16cfbdf20eaf Handle multiple files. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	540
16cfbdf20eaf Handle multiple files. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	541 // Shutdown
16cfbdf20eaf Handle multiple files. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	542 error:
16cfbdf20eaf Handle multiple files. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	543 if (inFile != NULL)
16cfbdf20eaf Handle multiple files. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	544 fclose(inFile);
16cfbdf20eaf Handle multiple files. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	545
16cfbdf20eaf Handle multiple files. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	546 return TRUE;
16cfbdf20eaf Handle multiple files. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	547 }
16cfbdf20eaf Handle multiple files. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	548
16cfbdf20eaf Handle multiple files. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	549
0 8e7e08bf7b9e Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	550 int main(int argc, char *argv[])
8e7e08bf7b9e Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	551 {
8e7e08bf7b9e Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	552 // Initialize
70 4779bbec2f28 Split some functionality into sidlib.[ch]. Matti Hamalainen <ccr@tnsp.org> parents: 63 diff changeset	553 th_init("SIDInfo", "PSID/RSID information displayer", "0.6.1", NULL, NULL);
0 8e7e08bf7b9e Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	554 th_verbosityLevel = 0;
8e7e08bf7b9e Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	555
59 718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	556 memset(&optFormat, 0, sizeof(optFormat));
718cdb563531 Initial implementation of -F format string option. Matti Hamalainen <ccr@tnsp.org> parents: 58 diff changeset	557
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	558 // Parse command line arguments
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	559 if (!th_args_process(argc, argv, optList, optListN,
23 832c26cb1637 Improve option handling. Matti Hamalainen <ccr@tnsp.org> parents: 21 diff changeset	560 argHandleOpt, argHandleFile, OPTH_ONLY_OPTS))
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	561 return -1;
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	562
29 d4ec69beb160 Add one line output format. Matti Hamalainen <ccr@tnsp.org> parents: 28 diff changeset	563 if (optOneLine)
d4ec69beb160 Add one line output format. Matti Hamalainen <ccr@tnsp.org> parents: 28 diff changeset	564 {
d4ec69beb160 Add one line output format. Matti Hamalainen <ccr@tnsp.org> parents: 28 diff changeset	565 optParsable = FALSE;
d4ec69beb160 Add one line output format. Matti Hamalainen <ccr@tnsp.org> parents: 28 diff changeset	566 optNoNamePrefix = TRUE;
d4ec69beb160 Add one line output format. Matti Hamalainen <ccr@tnsp.org> parents: 28 diff changeset	567 }
d4ec69beb160 Add one line output format. Matti Hamalainen <ccr@tnsp.org> parents: 28 diff changeset	568
23 832c26cb1637 Improve option handling. Matti Hamalainen <ccr@tnsp.org> parents: 21 diff changeset	569 // Process files
832c26cb1637 Improve option handling. Matti Hamalainen <ccr@tnsp.org> parents: 21 diff changeset	570 if (!th_args_process(argc, argv, optList, optListN,
832c26cb1637 Improve option handling. Matti Hamalainen <ccr@tnsp.org> parents: 21 diff changeset	571 argHandleOpt, argHandleFile, OPTH_ONLY_OTHER))
832c26cb1637 Improve option handling. Matti Hamalainen <ccr@tnsp.org> parents: 21 diff changeset	572 return -2;
832c26cb1637 Improve option handling. Matti Hamalainen <ccr@tnsp.org> parents: 21 diff changeset	573
19 16cfbdf20eaf Handle multiple files. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	574 if (optNFiles == 0)
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	575 {
ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	576 argShowHelp();
19 16cfbdf20eaf Handle multiple files. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	577 THERR("No filename(s) specified.\n");
2 ffb795582a91 More work. Matti Hamalainen <ccr@tnsp.org> parents: 1 diff changeset	578 }
1 25a3a142e909 Moar work. Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	579
19 16cfbdf20eaf Handle multiple files. Matti Hamalainen <ccr@tnsp.org> parents: 16 diff changeset	580 return 0;
0 8e7e08bf7b9e Initial import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	581 }

Mercurial > hg > sidinfo

annotate sidinfo.c @ 70:4779bbec2f28