===================================================================
RCS file: /home/cvs/OpenXM/rc/repl.c,v
retrieving revision 1.8
retrieving revision 1.12
diff -u -p -r1.8 -r1.12
--- OpenXM/rc/repl.c	2003/01/16 07:50:57	1.8
+++ OpenXM/rc/repl.c	2003/01/17 00:53:09	1.12
@@ -1,12 +1,18 @@
-/* $OpenXM: OpenXM/rc/repl.c,v 1.7 2002/04/05 01:55:59 takayama Exp $ */
+/* $OpenXM: OpenXM/rc/repl.c,v 1.11 2003/01/17 00:41:05 maekawa Exp $ */
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
+
+#include <errno.h>
+#include <fcntl.h>
 #include <string.h>
+#include <unistd.h>
 
 #define BUFSIZE 10000
 
+#define	REPL_IMGFILE	"/tmp/repl_test.img"
+#define	REPL_PSFILE	"/tmp/repl_test.ps"
+
 int
 main(int argc,char *argv[]) {
   char s[BUFSIZE];
@@ -14,6 +20,7 @@ main(int argc,char *argv[]) {
   char *slash;
   char type = 'b';
   FILE *fp;
+  int fd;
 
   if (argc >= 2) {
 	if (strcmp(argv[1],"csh")==0) {
@@ -21,8 +28,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) {
@@ -36,22 +49,27 @@ 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. Use the existing file.\n");
-  }else{
-     fprintf(fp,"/Times-Roman findfont 10 scalefont setfont\n");
-     fprintf(fp," 390 290 moveto  (F) show \n");
-     fprintf(fp,"showpage \n");
-     fclose(fp);
+  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 (!system("pstoimg -type png /tmp/repl_test.ps -out /tmp/repl_test.png >/dev/null")) {
+  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.img >/dev/null")) {
 	if (type == 'b') {
 	  printf("export OpenXM_PSTOIMG_TYPE=png\n");
 	}else{
 	  printf("setenv OpenXM_PSTOIMG_TYPE png\n");
 	}
-  }else if (!system("pstoimg -type gif /tmp/repl_test.ps -out /tmp/repl_test.gif >/dev/null")) {
+  }else if (!system("pstoimg -type gif /tmp/repl_test.ps -out /tmp/repl_test.img >/dev/null")) {
 	if (type == 'b') {
 	  printf("OpenXM_PSTOIMG_TYPE=gif\n");
       printf("export OpenXM_PSTOIMG_TYPE\n");
@@ -62,8 +80,17 @@ main(int argc,char *argv[]) {
 	printf("OpenXM_PSTOIMG_TYPE=no\n");
 	printf("export OpenXM_PSTOIMG_TYPE\n");
   }
-  system("rm -f /tmp/repl_test.*");
 
+  while (unlink(REPL_IMGFILE) != 0) {
+	if (errno == EINTR)
+		continue;
+	break;
+  }
+  while (unlink(REPL_PSFILE) != 0) {
+	if (errno == EINTR)
+		continue;
+	break;
+  }
 
-  exit(0);
+  exit(EXIT_SUCCESS);
 }