Browse Source

inpcom.c, remove variable "sourcefile" and references to "sourcefile"

this will no longer be required for access to input file residing
in the executable's directory
pre-master-46
h_vogt 13 years ago
committed by rlar
parent
commit
85ddc5b6db
  1. 28
      src/frontend/inpcom.c
  2. 2
      src/main.c

28
src/frontend/inpcom.c

@ -973,7 +973,6 @@ is_plain_filename(const char *p)
/*-------------------------------------------------------------------------* /*-------------------------------------------------------------------------*
Look up the variable sourcepath and try everything in the list in order Look up the variable sourcepath and try everything in the list in order
if the file isn't in . and it isn't an abs path name. if the file isn't in . and it isn't an abs path name.
For MS Windows: First try the path of the source file.
*-------------------------------------------------------------------------*/ *-------------------------------------------------------------------------*/
FILE * FILE *
@ -983,33 +982,6 @@ inp_pathopen(char *name, char *mode)
char buf[BSIZE_SP]; char buf[BSIZE_SP];
struct variable *v; struct variable *v;
#if defined(HAS_WINGUI)
char buf2[BSIZE_SP];
/* search in the path where the source (input) file has been found,
but only if "name" is just a file name */
if (!strchr(name, DIR_TERM) && !strchr(name, DIR_TERM_LINUX) && cp_getvar("sourcefile", CP_STRING, buf2)) {
/* If pathname is found, get path.
(char *dirname(const char *name) might have been used here) */
if (substring(DIR_PATHSEP, buf2) || substring(DIR_PATHSEP_LINUX, buf2)) {
int i, j = 0;
for (i = 0; i < BSIZE_SP-1; i++) {
if (buf2[i] == '\0')
break;
if ((buf2[i] == DIR_TERM) || (buf2[i] == DIR_TERM_LINUX))
j = i;
}
buf2[j+1] = '\0'; /* include path separator */
}
/* add file name */
strcat(buf2, name);
/* try to open file */
if ((fp = fopen(buf2, mode)) != NULL)
return (fp);
}
#endif
/* just try it */ /* just try it */
if ((fp = fopen(name, mode)) != NULL) if ((fp = fopen(name, mode)) != NULL)
return fp; return fp;

2
src/main.c

@ -1212,8 +1212,6 @@ main(int argc, char **argv)
#if defined(HAS_WINGUI) #if defined(HAS_WINGUI)
/* write source file name into source window */ /* write source file name into source window */
SetSource(dname); SetSource(dname);
/* write source file name into a variable */
cp_vset("sourcefile", CP_STRING, dname);
#endif #endif
append_to_stream(tempfile, tp); append_to_stream(tempfile, tp);

Loading…
Cancel
Save