/* can be NULL while c1mode or linking without compiling */
char *fullDstFileName; /* full name for the output file; */
/* only given by -o, otherwise NULL */
+size_t fullDstFileNameLen; /* size of previous string. */
char *dstFileName; /* destination file name without extension */
char *dstPath = ""; /* path for the output files; */
/* "" is equivalent with cwd */
int nlibPaths = 0;
char *relFiles[128];
int nrelFiles = 0;
-static char *preOutName;
/* uncomment JAMIN_DS390 to always override and use ds390 port
for mcs51 work. This is temporary, for compatibility testing. */
// Globally accessible scratch buffer for file names.
char scratchFileName[PATH_MAX];
-char buffer[PATH_MAX];
+char buffer[PATH_MAX * 2];
// In MSC VC6 default search path for exe's to path for this
#define OPTION_DATA_LOC "--data-loc"
#define OPTION_CODE_LOC "--code-loc"
#define OPTION_IDATA_LOC "--idata-loc"
+#define OPTION_NO_LABEL_OPT "--nolabelopt"
#define OPTION_NO_LOOP_INV "--noinvariant"
#define OPTION_NO_LOOP_IND "--noinduction"
#define OPTION_LESS_PEDANTIC "--lesspedantic"
{ 0, "--stack-10bit", &options.stack10bit, "use the 10bit stack for ds390 (default)" },
{ 0, "--xstack", &options.useXstack, "Use external stack" },
{ 0, OPTION_NO_GCSE, NULL, "Disable the GCSE optimisation" },
+ { 0, OPTION_NO_LABEL_OPT, NULL, "Disable label optimisation" },
{ 0, OPTION_NO_LOOP_INV, NULL, "Disable optimisation of invariants" },
{ 0, OPTION_NO_LOOP_IND, NULL, NULL },
{ 0, "--nojtbound", &optimize.noJTabBoundary, "Don't generate boundary check for jump tables" },
" (CYGWIN)\n"
#elif defined __MINGW32__
" (MINGW32) \n"
-#else
-# ifdef __DJGPP__
+#elif defined __DJGPP__
" (DJGPP) \n"
-# else
-# if defined(_MSC_VER)
- " (WIN32) \n"
-# else
+#elif defined(_MSC_VER)
+ " (MSVC) \n"
+#elif defined(__BORLANDC__)
+ " (BORLANDC) \n"
+#else
" (UNIX) \n"
-# endif
-# endif
#endif
,VersionString
}
/* copy the file name into the buffer */
- strcpy (buffer, s);
+ strncpyz (buffer, s, sizeof(buffer));
/* get rid of the "."-extension */
(longOpt && unsupportedOptTable[i].longOpt && !strcmp(unsupportedOptTable[i].longOpt, longOpt))) {
// Found an unsupported opt.
char buffer[100];
- sprintf(buffer, "%s%c%c", longOpt ? longOpt : "", shortOpt ? '-' : ' ', shortOpt ? shortOpt : ' ');
+ SNPRINTF(buffer, sizeof(buffer),
+ "%s%c%c",
+ longOpt ? longOpt : "",
+ shortOpt ? '-' : ' ', shortOpt ? shortOpt : ' ');
werror (W_UNSUPP_OPTION, buffer, unsupportedOptTable[i].message);
return 1;
}
continue;
}
+ if (strcmp (argv[i], OPTION_NO_LABEL_OPT) == 0)
+ {
+ optimize.label4 = 0;
+ continue;
+ }
+
if (strcmp (argv[i], OPTION_NO_LOOP_IND) == 0)
{
optimize.loopInduction = 0;
char *p;
/* copy the file name into the buffer */
- strcpy (buffer, getStringArg("-o", argv, &i, argc));
+ strncpyz(buffer, getStringArg("-o", argv, &i, argc),
+ sizeof(buffer));
/* point to last character */
p = buffer + strlen (buffer) - 1;
if (*p == DIR_SEPARATOR_CHAR)
else
{
fullDstFileName = Safe_strdup (buffer);
+ fullDstFileNameLen = strlen(fullDstFileName) + 1;
/* get rid of the "."-extension */
if (sOpt == 'Y')
sOpt = 'I';
- sprintf (buffer, "-%c%s", sOpt, rest);
+ SNPRINTF (buffer, sizeof(buffer), "-%c%s", sOpt, rest);
addToList (preArgv, buffer);
}
break;
/* use the modulename from the C-source */
if (fullSrcFileName)
{
- dstFileName = Safe_alloc (strlen (dstPath) + strlen (moduleName) + 1);
- strcpy (dstFileName, dstPath);
- strcat (dstFileName, moduleName);
+ size_t bufSize = strlen (dstPath) + strlen (moduleName) + 1;
+
+ dstFileName = Safe_alloc (bufSize);
+ strncpyz (dstFileName, dstPath, bufSize);
+ strncatz (dstFileName, moduleName, bufSize);
}
/* use the modulename from the first object file */
else if (nrelFiles >= 1)
{
char *objectName;
+ size_t bufSize;
- strcpy (buffer, relFiles[0]);
+ strncpyz (buffer, relFiles[0], sizeof(buffer));
/* remove extension (it must be .rel) */
*strrchr (buffer, '.') = '\0';
/* remove path */
{
objectName = buffer;
}
- dstFileName = Safe_alloc (strlen (dstPath) + strlen (objectName) + 1);
- strcpy (dstFileName, dstPath);
- strcat (dstFileName, objectName);
+ bufSize = strlen (dstPath) + strlen (objectName) + 1;
+ dstFileName = Safe_alloc (bufSize);
+ strncpyz (dstFileName, dstPath, bufSize);
+ strncatz (dstFileName, objectName, bufSize);
}
/* else no module given: help text is displayed */
}
/* if debug option is set the open the cdbFile */
if (options.debug && fullSrcFileName)
{
- sprintf (scratchFileName, "%s.adb", dstFileName); //JCF: Nov 30, 2002
+ SNPRINTF (scratchFileName, sizeof(scratchFileName),
+ "%s.adb", dstFileName); //JCF: Nov 30, 2002
if ((cdbFile = fopen (scratchFileName, "w")) == NULL)
werror (E_FILE_OPEN_ERR, scratchFileName);
else
int i, system_ret;
/* first we need to create the <filename>.lnk file */
- sprintf (scratchFileName, "%s.lnk", dstFileName);
+ SNPRINTF (scratchFileName, sizeof(scratchFileName),
+ "%s.lnk", dstFileName);
if (!(lnkfile = fopen (scratchFileName, "w")))
{
werror (E_FILE_OPEN_ERR, scratchFileName);
/* -o option overrides default name? */
if (fullDstFileName)
{
- strcpy (scratchFileName, fullDstFileName);
+ strncpyz (scratchFileName, fullDstFileName, sizeof(scratchFileName));
}
else
{
/* the linked file gets the name of the first modul */
if (fullSrcFileName)
{
- strcpy (scratchFileName, dstFileName);
+ strncpyz (scratchFileName, dstFileName, sizeof(scratchFileName));
}
else
{
- strcpy (scratchFileName, relFiles[0]);
+ strncpyz (scratchFileName, relFiles[0], sizeof(scratchFileName));
/* strip ".rel" extension */
*strrchr (scratchFileName, '.') = '\0';
}
- strcat (scratchFileName, options.out_fmt ? ".S19" : ".ihx");
+ strncatz (scratchFileName,
+ options.out_fmt ? ".S19" : ".ihx",
+ sizeof(scratchFileName));
}
if (port->linker.cmd)
{
char buffer2[PATH_MAX];
buildCmdLine (buffer2, port->linker.cmd, dstFileName, scratchFileName, NULL, NULL);
- buildCmdLine2 (buffer, buffer2);
+ buildCmdLine2 (buffer, buffer2, sizeof(buffer));
}
else
{
- buildCmdLine2 (buffer, port->linker.mcmd);
+ buildCmdLine2 (buffer, port->linker.mcmd, sizeof(buffer));
}
system_ret = my_system (buffer);
/* the linked file gets the name of the first modul */
if (fullSrcFileName)
{
- strcpy (scratchFileName, dstFileName);
+ strncpyz (scratchFileName, dstFileName, sizeof(scratchFileName));
p = strlen (scratchFileName) + scratchFileName;
}
else
{
- strcpy (scratchFileName, relFiles[0]);
+ strncpyz (scratchFileName, relFiles[0], sizeof(scratchFileName));
/* strip "rel" extension */
- p = strrchr (scratchFileName, '.') + 1;
+ p = strrchr (scratchFileName, '.');
+ if (p)
+ {
+ p++;
+ *p = 0;
+ }
+
}
- strcpy (p, options.out_fmt ? "S19" : "ihx");
+ strncatz (scratchFileName,
+ options.out_fmt ? "S19" : "ihx",
+ sizeof(scratchFileName));
rename (scratchFileName, fullDstFileName);
q = strrchr (fullDstFileName, '.');
else
{
/* no extension: append new extensions */
+ /* Don't we want to append a period here ? */
q = strlen (fullDstFileName) + fullDstFileName;
}
- strcpy (p, "map");
- strcpy (q, "map");
+
+ *p = 0;
+ strncatz (scratchFileName, "map", sizeof(scratchFileName));
+ *q = 0;
+ strncatz(fullDstFileName, "map", fullDstFileNameLen);
rename (scratchFileName, fullDstFileName);
- strcpy (p, "mem");
- strcpy (q, "mem");
+ *p = 0;
+ strncatz (scratchFileName, "mem", sizeof(scratchFileName));
+ *q = 0;
+ strncatz(fullDstFileName, "mem", fullDstFileNameLen);
rename (scratchFileName, fullDstFileName);
}
if (system_ret)
/* -o option overrides default name? */
if (options.cc_only && fullDstFileName) {
- strcpy (scratchFileName, fullDstFileName);
+ strncpyz (scratchFileName, fullDstFileName, sizeof(scratchFileName));
} else {
/* the assembled file gets the name of the first modul */
- strcpy (scratchFileName, dstFileName);
- strcat (scratchFileName, port->linker.rel_ext);
+ strncpyz (scratchFileName, dstFileName, sizeof(scratchFileName));
+ strncatz (scratchFileName, port->linker.rel_ext,
+ sizeof(scratchFileName));
}
if (port->assembler.do_assemble) {
options.debug ? port->assembler.debug_opts : port->assembler.plain_opts,
asmOptions);
} else {
- buildCmdLine2 (buffer, port->assembler.mcmd);
+ buildCmdLine2 (buffer, port->assembler.mcmd, sizeof(buffer));
}
if (my_system (buffer)) {
/* TODO: most assembler don't have a -o parameter */
/* -o option overrides default name? */
if (options.cc_only && fullDstFileName) {
- strcpy (scratchFileName, dstFileName);
- strcat (scratchFileName, port->linker.rel_ext);
+ strncpyz (scratchFileName, dstFileName, sizeof(scratchFileName));
+ strncatz (scratchFileName,
+ port->linker.rel_ext,
+ sizeof(scratchFileName));
rename (scratchFileName, fullDstFileName);
}
}
setMainValue ("cppextraopts", join(preArgv));
- if (preProcOnly)
- {
- if (fullDstFileName)
- {
- preOutName = Safe_strdup (fullDstFileName);
- }
- }
+ if (preProcOnly && fullDstFileName)
+ {
+ /* -E and -o given */
+ setMainValue ("cppoutfilename", fullDstFileName);
+ }
else
- preOutName = Safe_strdup (tempfilename ());
-
- /* Have to set cppoutfilename to something, even if just pre-processing. */
- setMainValue ("cppoutfilename", preOutName ? preOutName : "");
- addSetHead (&tmpfileNameSet, preOutName);
+ {
+ /* Have to set cppoutfilename to something, even if piping */
+ setMainValue ("cppoutfilename", "");
+ }
if (options.verbose)
printf ("sdcc: Calling preprocessor...\n");
- buildCmdLine2 (buffer, _preCmd);
+ buildCmdLine2 (buffer, _preCmd, sizeof(buffer));
- if (my_system (buffer))
- {
+ if (preProcOnly) {
+ if (my_system (buffer)) {
exit (1);
}
- if (preProcOnly)
- {
- exit (0);
- }
- yyin = fopen (preOutName, "r");
- if (yyin == NULL)
- {
- perror ("Preproc file not found\n");
+
+ exit (0);
+ }
+
+ yyin = my_popen (buffer);
+ if (yyin == NULL) {
+ perror ("Preproc file not found");
exit (1);
- }
- addSetHead (&tmpfileSet, yyin);
+ }
+ addSetHead (&pipeSet, yyin);
}
return 0;
where expected. If so, set.
*/
getPathDifference (buffer, PREFIX, SDCC_INCLUDE_DIR);
- strcpy (scratchFileName, pprefix);
- strcat (scratchFileName, buffer);
+ strncpyz (scratchFileName, pprefix, sizeof(scratchFileName));
+ strncatz (scratchFileName, buffer, sizeof(scratchFileName));
if (pathExists (scratchFileName))
{
}
getPathDifference (buffer, PREFIX, SDCC_LIB_DIR);
- strcpy (scratchFileName, pprefix);
- strcat (scratchFileName, buffer);
+ strncpyz (scratchFileName, pprefix, sizeof(scratchFileName));
+ strncatz (scratchFileName, buffer, sizeof(scratchFileName));
if (pathExists (scratchFileName))
{
*/
if (strchr (argv0, DIR_SEPARATOR_CHAR))
{
- strcpy (scratchFileName, argv0);
+ strncpyz (scratchFileName, argv0, sizeof(scratchFileName));
*strrchr (scratchFileName, DIR_SEPARATOR_CHAR) = '\0';
setMainValue ("bindir", scratchFileName);
ExePathList[0] = Safe_strdup (scratchFileName);
else if (getenv (SDCCDIR_NAME) != NULL)
{
getPathDifference (buffer, PREFIX, BINDIR);
- strcpy (scratchFileName, getenv (SDCCDIR_NAME));
- strcat (scratchFileName, buffer);
+ strncpyz (scratchFileName, getenv (SDCCDIR_NAME), sizeof(scratchFileName));
+ strncatz (scratchFileName, buffer, sizeof(scratchFileName));
setMainValue ("bindir", scratchFileName);
ExePathList[0] = Safe_strdup (scratchFileName);
}
printf ("sdcc: Generating code...\n");
yyparse ();
+
+ pclose(yyin);
+ deleteSetItem(&pipeSet, yyin);
+
if (fatalError) {
exit (1);
}
projects / fw / sdcc / blobdiff