summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
db1a7e1)
git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@4199
4a8a32a2-be11-0410-ad9d-
d568d2c75423
* src/SDCCast.c (isLoopCountable): fixed bug #1478316
(processParms): fixed bug #1247551
* src/SDCCast.c (isLoopCountable): fixed bug #1478316
(processParms): fixed bug #1247551
+ * src/SDCCmain.c (printVersionInfo, printOptions, printUsage,
+ parseCmdLine, main): print version to stdout, help to stdout on
+ windows and to stderr on all the rest; exit with EXIT_FAILURE if
+ no arguments given
2006-05-27 Bernhard Held <bernhard AT bernhardheld.de>
2006-05-27 Bernhard Held <bernhard AT bernhardheld.de>
/* printVersionInfo - prints the version info */
/*-----------------------------------------------------------------*/
void
/* printVersionInfo - prints the version info */
/*-----------------------------------------------------------------*/
void
+printVersionInfo (FILE *stream)
"SDCC : ");
for (i = 0; i < NUM_PORTS; i++)
"SDCC : ");
for (i = 0; i < NUM_PORTS; i++)
- fprintf (stderr, "%s%s", i == 0 ? "" : "/", _ports[i]->target);
+ fprintf (stream, "%s%s", i == 0 ? "" : "/", _ports[i]->target);
- fprintf (stderr, " " SDCC_VERSION_STR
+ fprintf (stream, " " SDCC_VERSION_STR
#ifdef SDCC_SUB_VERSION_STR
"/" SDCC_SUB_VERSION_STR
#endif
#ifdef SDCC_SUB_VERSION_STR
"/" SDCC_SUB_VERSION_STR
#endif
-printOptions(const OPTION *optionsTable)
+printOptions(const OPTION *optionsTable, FILE *stream)
if (!optionsTable[i].shortOpt && !optionsTable[i].longOpt
&& optionsTable[i].help)
{
if (!optionsTable[i].shortOpt && !optionsTable[i].longOpt
&& optionsTable[i].help)
{
- fprintf (stdout, "\n%s:\n", optionsTable[i].help);
+ fprintf (stream, "\n%s:\n", optionsTable[i].help);
- fprintf(stdout, " %c%c %-20s %s\n",
+ fprintf(stream, " %c%c %-20s %s\n",
optionsTable[i].shortOpt !=0 ? '-' : ' ',
optionsTable[i].shortOpt !=0 ? optionsTable[i].shortOpt : ' ',
optionsTable[i].longOpt != NULL ? optionsTable[i].longOpt : "",
optionsTable[i].shortOpt !=0 ? '-' : ' ',
optionsTable[i].shortOpt !=0 ? optionsTable[i].shortOpt : ' ',
optionsTable[i].longOpt != NULL ? optionsTable[i].longOpt : "",
/*-----------------------------------------------------------------*/
/* printUsage - prints command line syntax */
/*-----------------------------------------------------------------*/
/*-----------------------------------------------------------------*/
/* printUsage - prints command line syntax */
/*-----------------------------------------------------------------*/
printUsage (void)
{
int i;
printUsage (void)
{
int i;
- printVersionInfo();
- fprintf (stdout,
+#if defined(__MINGW32__)
+ FILE *stream = stdout;
+#elif defined(__DJGPP__)
+ FILE *stream = stdout;
+#elif defined(_MSC_VER)
+ FILE *stream = stdout;
+#elif defined(__BORLANDC__)
+ FILE *stream = stdout;
+#else
+ FILE *stream = stderr;
+#endif
+
+ printVersionInfo (stream);
+ fprintf (stream,
"Usage : sdcc [options] filename\n"
"Options :-\n"
);
"Usage : sdcc [options] filename\n"
"Options :-\n"
);
- printOptions(optionsTable);
+ printOptions (optionsTable, stream);
for (i = 0; i < NUM_PORTS; i++)
{
if (_ports[i]->poptions != NULL)
{
for (i = 0; i < NUM_PORTS; i++)
{
if (_ports[i]->poptions != NULL)
{
- fprintf (stdout, "\nSpecial options for the %s port:\n", _ports[i]->target);
- printOptions (_ports[i]->poptions);
+ fprintf (stream, "\nSpecial options for the %s port:\n", _ports[i]->target);
+ printOptions (_ports[i]->poptions, stream);
}
/*-----------------------------------------------------------------*/
}
/*-----------------------------------------------------------------*/
if (strcmp (argv[i], OPTION_HELP) == 0)
{
printUsage ();
if (strcmp (argv[i], OPTION_HELP) == 0)
{
printUsage ();
}
if (strcmp (argv[i], OPTION_STACK_8BIT) == 0)
}
if (strcmp (argv[i], OPTION_STACK_8BIT) == 0)
if (strcmp (argv[i], OPTION_VERSION) == 0)
{
if (strcmp (argv[i], OPTION_VERSION) == 0)
{
+ printVersionInfo (stdout);
verifyShortOption(argv[i]);
printUsage ();
verifyShortOption(argv[i]);
printUsage ();
case 'v':
verifyShortOption(argv[i]);
case 'v':
verifyShortOption(argv[i]);
+ printVersionInfo (stdout);
/* turn all optimizations off by default */
memset (&optimize, 0, sizeof (struct optimize));
/* turn all optimizations off by default */
memset (&optimize, 0, sizeof (struct optimize));
- /*printVersionInfo (); */
-
if (NUM_PORTS==0) {
fprintf (stderr, "Build error: no ports are enabled.\n");
exit (1);
if (NUM_PORTS==0) {
fprintf (stderr, "Build error: no ports are enabled.\n");
exit (1);
doPrintSearchDirs();
/* if no input then printUsage & exit */
doPrintSearchDirs();
/* if no input then printUsage & exit */
- if (!options.c1mode && !fullSrcFileName && peekSet(relFilesSet) == NULL) {
- if (!options.printSearchDirs)
+ if (!options.c1mode && !fullSrcFileName && peekSet(relFilesSet) == NULL)
+ {
+ if (options.printSearchDirs)
+ exit (EXIT_SUCCESS);
+ exit (EXIT_FAILURE);
+ }
/* initMem() is expensive, but
initMem() must called before port->finaliseOptions ().
/* initMem() is expensive, but
initMem() must called before port->finaliseOptions ().