aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--src/numconvert.c97
1 files changed, 57 insertions, 40 deletions
diff --git a/src/numconvert.c b/src/numconvert.c
index e40e22c..d7680b4 100644
--- a/src/numconvert.c
+++ b/src/numconvert.c
@@ -161,64 +161,81 @@ int main(int argc, char * argv[])
161 { 161 {
162 case -1: /* no more arguments */ 162 case -1: /* no more arguments */
163 case 0: /* long options toggles */ 163 case 0: /* long options toggles */
164 break; 164 break;
165
165 case 'A': 166 case 'A':
166 opt |= MY_OPT_ASCII; 167 opt |= MY_OPT_ASCII;
167 break; 168 break;
169
168 case 'a': 170 case 'a':
169 base = -1; 171 base = -1;
170 //opt |= (MY_OPT_BIN|MY_OPT_DEC|MY_OPT_HEX|MY_OPT_OCT|); 172 //opt |= (MY_OPT_BIN|MY_OPT_DEC|MY_OPT_HEX|MY_OPT_OCT|);
171 break; 173 break;
174
172 case 'B': 175 case 'B':
173 opt |= MY_OPT_BIN; 176 opt |= MY_OPT_BIN;
174 break; 177 break;
178
175 case 'b': 179 case 'b':
176 base = 2; 180 base = 2;
177 break; 181 break;
182
178 case 'D': 183 case 'D':
179 opt |= MY_OPT_DEC; 184 opt |= MY_OPT_DEC;
180 break; 185 break;
186
181 case 'd': 187 case 'd':
182 base = 10; 188 base = 10;
183 break; 189 break;
190
184 case 'h': 191 case 'h':
185 my_usage(); 192 my_usage();
186 return(0); 193 return(0);
187 case 'l': 194 case 'l':
188 opt |= MY_OPT_LIMIT; 195 opt |= MY_OPT_LIMIT;
189 break; 196 break;
197
190 case 'O': 198 case 'O':
191 opt |= MY_OPT_OCT; 199 opt |= MY_OPT_OCT;
192 break; 200 break;
201
193 case 'o': 202 case 'o':
194 base = 8; 203 base = 8;
195 break; 204 break;
205
196 case 'R': 206 case 'R':
197 opt |= MY_OPT_LEBYTE; 207 opt |= MY_OPT_LEBYTE;
198 break; 208 break;
209
199 case 'r': 210 case 'r':
200 opt |= MY_OPT_LEBYTE; 211 opt |= MY_OPT_LEBYTE;
201 opt |= MY_OPT_LEBIT; 212 opt |= MY_OPT_LEBIT;
202 break; 213 break;
214
203 case 's': 215 case 's':
204 opt = MY_TOGGLE(opt, MY_OPT_SPACE); 216 opt = MY_TOGGLE(opt, MY_OPT_SPACE);
205 break; 217 break;
218
206 case 'X': 219 case 'X':
207 opt |= MY_OPT_HEX; 220 opt |= MY_OPT_HEX;
208 break; 221 break;
222
209 case 'x': 223 case 'x':
210 base = 16; 224 base = 16;
211 break; 225 break;
226
212 case 'V': 227 case 'V':
213 my_version(); 228 my_version();
214 return(0); 229 return(0);
230
215 case '?': 231 case '?':
216 fprintf(stderr, "Try `%s --help' for more information.\n", PROGRAM_NAME); 232 fprintf(stderr, "Try `%s --help' for more information.\n", PROGRAM_NAME);
217 return(1); 233 return(1);
234
218 default: 235 default:
219 fprintf(stderr, "%s: unrecognized option `--%c'\n", PROGRAM_NAME, c); 236 fprintf(stderr, "%s: unrecognized option `--%c'\n", PROGRAM_NAME, c);
220 fprintf(stderr, "Try `%s --help' for more information.\n", PROGRAM_NAME); 237 fprintf(stderr, "Try `%s --help' for more information.\n", PROGRAM_NAME);
221 return(1); 238 return(1);
222 }; 239 };
223 }; 240 };
224 241