=================================================================== RCS file: /home/cvs/OpenXM/rc/repl.c,v retrieving revision 1.4 retrieving revision 1.11 diff -u -p -r1.4 -r1.11 --- OpenXM/rc/repl.c 2001/08/29 11:18:58 1.4 +++ OpenXM/rc/repl.c 2003/01/17 00:41:05 1.11 @@ -1,15 +1,25 @@ -/* $OpenXM: OpenXM/rc/repl.c,v 1.3 2000/01/20 02:34:49 noro Exp $ */ +/* $OpenXM: OpenXM/rc/repl.c,v 1.10 2003/01/16 08:27:23 maekawa Exp $ */ + #include -#include +#include + +#include +#include #include +#include #define BUFSIZE 10000 + +#define REPL_PSFILE "/tmp/repl_test.ps" + +int main(int argc,char *argv[]) { char s[BUFSIZE]; char cwd[BUFSIZE]; char *slash; char type = 'b'; FILE *fp; + int fd; if (argc >= 2) { if (strcmp(argv[1],"csh")==0) { @@ -17,8 +27,14 @@ main(int argc,char *argv[]) { } } - getcwd(cwd,BUFSIZE); - slash = strrchr(cwd,'/'); + if (getcwd(cwd, sizeof(cwd)) == NULL) { + fprintf(stderr, "getcwd: %s\n", strerror(errno)); + exit(EXIT_FAILURE); + } + if ((slash = strrchr(cwd, '/')) == cwd) { + fprintf(stderr, "The current working directory is /.\n"); + exit(EXIT_FAILURE); + } *slash = 0; while (fgets(s,BUFSIZE,stdin) != NULL) { if (strcmp(s,"OpenXM_HOME=$HOME/OpenXM\n") == 0) { @@ -32,15 +48,20 @@ main(int argc,char *argv[]) { /* Configuring environmental variables. */ /* Check if pstoimg (src/asir-contrib) supports png format. */ - fp = fopen("/tmp/repl_test.ps","w"); - if (fp == NULL) { - fprintf(stderr,"Open error of /tmp/repl_test.ps\n"); - exit(10); + if ((fd = open("/tmp/repl_test.ps", O_WRONLY|O_CREAT|O_EXCL|O_TRUNC, + S_IRUSR|S_IWUSR)) < 0) { + fprintf(stderr, "open: %s: %s\n", REPL_PSFILE, strerror(errno)); + exit(EXIT_FAILURE); } + if ((fp = fdopen(fd, "w")) == NULL) { + fprintf(stderr, "fdopen: %s", strerror(errno)); + exit(EXIT_FAILURE); + } fprintf(fp,"/Times-Roman findfont 10 scalefont setfont\n"); fprintf(fp," 390 290 moveto (F) show \n"); fprintf(fp,"showpage \n"); fclose(fp); + if (!system("pstoimg -type png /tmp/repl_test.ps -out /tmp/repl_test.png >/dev/null")) { if (type == 'b') { printf("export OpenXM_PSTOIMG_TYPE=png\n"); @@ -49,18 +70,17 @@ main(int argc,char *argv[]) { } }else if (!system("pstoimg -type gif /tmp/repl_test.ps -out /tmp/repl_test.gif >/dev/null")) { if (type == 'b') { - printf("export OpenXM_PSTOIMG_TYPE=gif\n"); + printf("OpenXM_PSTOIMG_TYPE=gif\n"); + printf("export OpenXM_PSTOIMG_TYPE\n"); }else{ printf("setenv OpenXM_PSTOIMG_TYPE=gif\n"); } }else { - printf("export OpenXM_PSTOIMG_TYPE=no\n"); + printf("OpenXM_PSTOIMG_TYPE=no\n"); + printf("export OpenXM_PSTOIMG_TYPE\n"); } - /* system("rm -f /tmp/repl_test.*"); */ + system("rm -f /tmp/repl_test.*"); - - exit(0); -} - - + exit(EXIT_SUCCESS); +}