commits for 7.5.0 pre-release tarball

[xconq] / x11 / SelFile / SelFile.c

diff --git a/SelFile/SelFile.c b/x11/SelFile/SelFile.c
similarity index 95%
rename from SelFile/SelFile.c
rename to x11/SelFile/SelFile.c
index a2c4d407e6c74aca8eba48a77bfdbe08abe2a2c0..728f0308e0392788b79495bf7920313e88ab0594 100644 (file)
--- a/SelFile/SelFile.c
+++ b/x11/SelFile/SelFile.c
@@ -44,13 +44,6 @@
 #include <stdio.h>
 #include <errno.h>
 
-#ifndef __GLIBC__
-/* BSD 4.3 errno.h does not declare errno */
-extern int errno;
-extern int sys_nerr;
-extern char *sys_errlist[];
-#endif
-
 #include <sys/param.h>
 #include <X11/cursorfont.h>
 #include <X11/Intrinsic.h>
@@ -68,10 +61,6 @@ extern char *sys_errlist[];
 #define MAXPATHLEN 1024
 #endif /* ndef MAXPATHLEN */
 
-#if !defined(SVR4) && !defined(SYSV) && !defined(USG)
-extern char *getwd();
-#endif /* !defined(SVR4) && !defined(SYSV) && !defined(USG) */
-
 int SFstatus = SEL_FILE_NULL;
 
 char
@@ -565,19 +554,13 @@ SFopenFile(name, mode, prompt, failed)
     SFchdir(SFstartDir);
     if ((fp = fopen(name, mode)) == NULL) {
        char *buf;
-       if (errno <= sys_nerr) {
-           buf = XtMalloc(strlen(failed) + strlen(sys_errlist[errno]) + 
-                          strlen(prompt) + 2);
-           strcpy(buf, failed);
-           strcat(buf, sys_errlist[errno]);
-           strcat(buf, "\n");
-           strcat(buf, prompt);
-       } else {
-           buf = XtMalloc(strlen(failed) + strlen(prompt) + 2);
-           strcpy(buf, failed);
-           strcat(buf, "\n");
-           strcat(buf, prompt);
-       }
+       buf = XtMalloc(strlen(failed) + strlen(strerror(errno))
+                      + strlen(prompt) + 2);
+       strcpy(buf, failed);
+       strcat(buf, strerror(errno)); 
+       strcat(buf, "\n");
+       strcat(buf, prompt);
+
        XtSetArg(args[0], XtNlabel, buf);
        XtSetValues(selFilePrompt, args, 1);
        XtFree(buf);
@@ -683,12 +666,7 @@ XsraSelFile(toplevel, prompt, ok, cancel, failed,
        SFpositionWidget(selFile);
        XtMapWidget(selFile);
 
-#if defined(SVR4) || defined(SYSV) || defined(USG)
        if (!getcwd(SFstartDir, MAXPATHLEN)) {
-#else /* defined(SVR4) || defined(SYSV) || defined(USG) */
-       if (!getwd(SFstartDir)) {
-#endif /* defined(SVR4) || defined(SYSV) || defined(USG) */
-
                XtAppError(SFapp, "XsraSelFile: can't get current directory");
        }
        (void) strcat(SFstartDir, "/");