=================================================================== RCS file: /home/cvs/OpenXM/src/kan96xx/Kan/shell.c,v retrieving revision 1.8 retrieving revision 1.17 diff -u -p -r1.8 -r1.17 --- OpenXM/src/kan96xx/Kan/shell.c 2003/12/05 07:05:24 1.8 +++ OpenXM/src/kan96xx/Kan/shell.c 2020/10/06 11:33:47 1.17 @@ -1,5 +1,6 @@ -/* $OpenXM: OpenXM/src/kan96xx/Kan/shell.c,v 1.7 2003/12/04 06:29:21 takayama Exp $ */ +/* $OpenXM: OpenXM/src/kan96xx/Kan/shell.c,v 1.16 2013/09/20 06:02:19 takayama Exp $ */ #include +#include #include #include #include @@ -63,7 +64,7 @@ void KoxShellHelp(char *key,FILE *fp) { for (i=0; strcmp(keys[i],"@@@@gatekeeper") != 0; i++) { fprintf(fp,"%s\n",keys[i]); KoxShellHelp(keys[i],fp); - fprintf(fp,"\n",keys[i]); + fprintf(fp,"%s\n",keys[i]); } return; } @@ -83,7 +84,9 @@ void KoxShellHelp(char *key,FILE *fp) { s[1] = "cmdname arg1 arg2 ... "; s[2] = "Example 1: /afo (Hello! ) def [(cat) (stringIn://afo)] oxshell"; s[3] = "Example 2: [(polymake) (stringInOut://afo.poly) (FACETS)] oxshell"; - s[4] = NULL; + s[4] = "A temporary file afo.poly* with the contents of the variable afo.poly is generated under $TMP and \"polymake $TMP FACETS\" will be executed. cf. kan96xx/trans/doPolymake.sm1, Doc/oxshell.oxw, Doc/changelog-ja.tex"; + s[5] = "Example 3: [(ls) (-l) (>) (stringOut://ff)] oxshell"; + s[6] = NULL; }else if (strcmp(key,"redirect")==0) { s[0] = "The following redirect operators are implemented."; s[1] = "< > 2>"; @@ -96,7 +99,8 @@ void KoxShellHelp(char *key,FILE *fp) { }else if (strcmp(key,"keep_tmp_files")==0) { s[0] = "keep_tmp_files value"; s[1] = "If value is zero, then temporary files are removed after execution."; - s[2] = NULL; + s[2] = "Example 1: [(keep_tmp_files) (1)] oxshell ; temporary files will be kept in /tmp or $TMP or ..."; + s[3] = NULL; }else{ } i = 0; @@ -108,7 +112,7 @@ void KoxShellHelp(char *key,FILE *fp) { static struct object KoxShell_test1(struct object ob) { /* A simple shell. It does not implement a parser. */ - struct object rob; + struct object rob = OINIT; char *cmd; char *arg1,*arg2; int i,n; @@ -125,9 +129,13 @@ static struct object KoxShell_test1(struct object ob) rob = testmain(ob); }else if (strcmp(cmd,"which")==0) { if (n == 2) { + pathFinderErrorVerbose(0); rob = KoxWhich(getoa(ob,1),KpoInteger(0)); + pathFinderErrorVerbose(-1); }else if (n==3) { + pathFinderErrorVerbose(0); rob = KoxWhich(getoa(ob,1),getoa(ob,2)); + pathFinderErrorVerbose(-1); }else{ errorKan1("%s\n","shell: << which command-name >> or << which command-name path >>"); } @@ -155,7 +163,7 @@ static struct object KoxShell_test1(struct object ob) /* Functions for ox_shell */ struct object KoxWhich(struct object cmdo,struct object patho) { - struct object rob; + struct object rob = OINIT; char *sss; rob = NullObject; if (cmdo.tag != Sdollar) errorKan1("%s\n","KoxWhich(str-obj,str-obj)"); @@ -173,9 +181,31 @@ struct object KoxWhich(struct object cmdo,struct objec return(rob); } +static int mysetenv(char *name, char *value, int overwrite); +static int myunsetenv(char *name); +static int mysetenv(char *name, char *value, int overwrite) { + char *s; + char *orig; + s = (char *)getenv(name); + if ((s == NULL) || overwrite) { + s = (char *) mymalloc(strlen(name)+strlen(value)+5); + if (s == 0) { fprintf(stderr,"No more memory.\n"); exit(10); } + strcpy(s,name); + strcat(s,"="); strcat(s,value); + return(putenv(s)); + } + return (0); +} + +/* bug on Solaris. It does not unsetenv. + libc4, libc5, glibc. It does unsetenv. */ +static int myunsetenv(char *name) { + return(putenv(name)); +} + /* Example. [(export) (PATH) (=) (/usr/new/bin:$PATH)] */ static struct object oxsSetenv(struct object ob) { - struct object rob; + struct object rob = OINIT; int i,n; char *envp; char *new; @@ -197,9 +227,10 @@ static struct object oxsSetenv(struct object ob) { /* printf("%s\n",new); */ new = oxEvalEnvVar(new); /* printf("%s\n",new); */ - r = setenv(envp,new,1); + r = mysetenv(envp,new,1); }else{ - unsetenv(envp); r = 0; + myunsetenv(envp); r = 0; + /* bug: On Solaris, unsetenv will not work. */ } if (r != 0) errorKan1("%s\n","setenv failed."); new = (char *) getenv(envp); @@ -348,9 +379,9 @@ char *oxsURIgetFileName(char *s) { static struct object testmain(struct object ob) { - struct object rob; + struct object rob = OINIT; char *s; - struct object ot; + struct object ot = OINIT; char **av; int i; rob = NullObject; @@ -379,7 +410,7 @@ char *oxsVarToFile(char *v,char *ext,char *command,int FILE *fp; int n,i,prevc,c; char *prog; - struct object vv; + struct object vv = OINIT; /*bug; winname must be automatically set by looking at command. If command is win32-native-application, then winname=1; else winname=0. @@ -420,12 +451,18 @@ int oxsFileToVar(char *v,char *fname) { int limit; int c,i; - if (v == NULL) errorKan1("%s\n","oxsFileToVar(), v is NULL."); + if (v == NULL) { + /* errorKan1("%s\n","oxsFileToVar(), v is NULL."); */ + fprintf(stderr,"oxsFileToVar(), v is NULL."); + return(-1); + } limit = 1024; fp = fopen(fname,"r"); if (fp == NULL) { fprintf(stderr,"Filename=%s\n",fname); - errorKan1("%s\n","oxsFileToVar(), the file cannot be opened."); + /* errorKan1("%s\n","oxsFileToVar(), the file cannot be opened."); */ + fprintf(stderr,"oxsFileToVar(), the file cannot be opened."); + return(-1); } s = (char *)mymalloc(limit); if (s == NULL) errorKan1("%s\n","No more memory in oxsFileToVar()."); @@ -455,7 +492,7 @@ static char **oxsBuildArgv(struct object ob) { char *ext, *v; int usetmp=1; int win=0; - struct object ocmd; + struct object ocmd = OINIT; /* bug: win variable must be properly set on windows native. */ @@ -533,6 +570,7 @@ static struct object oxsExecuteBlocked(struct object o { int r,i,n; char **argv; + int errorf; argv = oxsBuildArgv(ob); argv = oxsBuildArgvRedirect(argv); @@ -545,9 +583,12 @@ static struct object oxsExecuteBlocked(struct object o errorKan1("%s\n","ForkExecBlocked failed."); } */ + errorf=0; if (AfterPt > 0) { for (i=0; i< AfterPt; i++) { - oxsFileToVar(AfterSetVar[i],AfterReadFile[i]); + if (oxsFileToVar(AfterSetVar[i],AfterReadFile[i]) != 0) { + errorf=1; + } } } AfterPt = 0; @@ -560,6 +601,7 @@ static struct object oxsExecuteBlocked(struct object o } } AfterD = 0; + if (errorf) errorKan1("%s\n","Some errors in oxsFileToVar()."); return(KpoInteger(r)); }