extern/boxes
1
0
Fork 0
mirror of https://github.com/ascii-boxes/boxes.git synced 2025-01-19 20:38:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Port to Win32 platform based on patches by Ron Aaron

Browse Source 
Changes only affect Win32 version. Win32 behavior differs from the UNIX
platforms in the way the config file is searched and the config file
name (boxes.cfg).
This commit is contained in:
Thomas Jensen 2000-03-17 23:44:26 +00:00
parent 980a056d33
commit 4d48f2c8ef
1 changed files with 69 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/boxes.c
View File

@ -3,7 +3,7 @@
* Date created: March 18, 1999 (Thursday, 15:09h) * Date created: March 18, 1999 (Thursday, 15:09h)
* Author: Copyright (C) 1999 Thomas Jensen * Author: Copyright (C) 1999 Thomas Jensen
* tsjensen@stud.informatik.uni-erlangen.de * tsjensen@stud.informatik.uni-erlangen.de
* Version: $Id: boxes.c,v 1.32 1999/08/22 11:34:46 tsjensen Exp tsjensen $ * Version: $Id: boxes.c,v 1.33 1999/09/10 19:21:05 tsjensen Exp tsjensen $
* Language: ANSI C * Language: ANSI C
* Platforms: sunos5/sparc, for now * Platforms: sunos5/sparc, for now
* World Wide Web: http://home.pages.de/~jensen/boxes/ * World Wide Web: http://home.pages.de/~jensen/boxes/
@ -48,6 +48,13 @@
* Revision History: * Revision History:
* *
* $Log: boxes.c,v $ * $Log: boxes.c,v $
* Revision 1.33 1999/09/10 19:21:05 tsjensen
* Eliminated use of PATH_MAX in order to ease porting
* Restructured infile/outfile code to eliminate need for access() function
* and improve readability
* Added file type check before reading config file. boxes used to generate
* a weird error message if the config file is a directory
*
* Revision 1.32 1999/08/22 11:34:46 tsjensen * Revision 1.32 1999/08/22 11:34:46 tsjensen
* Bugfix: no-input-check must take place before indentation computation * Bugfix: no-input-check must take place before indentation computation
* *
@ -215,12 +222,22 @@
#include "generate.h" #include "generate.h"
#include "remove.h" #include "remove.h"
#ifdef __MINGW32__
#include <windows.h>
#endif
extern char *optarg; /* for getopt() */ extern char *optarg; /* for getopt() */
extern int optind, opterr, optopt; /* for getopt() */ extern int optind, opterr, optopt; /* for getopt() */
#ifdef __MINGW32__
#define BOXES_CONFIG "boxes.cfg" /* filename of config file in $HOME */
#else
#define BOXES_CONFIG ".boxes"
#endif
static const char rcsid_boxes_c[] = static const char rcsid_boxes_c[] =
"$Id: boxes.c,v 1.32 1999/08/22 11:34:46 tsjensen Exp tsjensen $"; "$Id: boxes.c,v 1.33 1999/09/10 19:21:05 tsjensen Exp tsjensen $";
@ -283,6 +300,9 @@ static int is_dir (const char *path)
* *
* path file name to check * path file name to check
* *
* On Windows, this check seems unnecessary, because fopen() seems to fail
* when applied to a directory.
*
* RETURNS: == 0 path is not a directory * RETURNS: == 0 path is not a directory
* > 0 path is a directory * > 0 path is a directory
* == -1 error in stat() call * == -1 error in stat() call
@ -326,6 +346,9 @@ static int get_config_file()
FILE *new_yyin = NULL; FILE *new_yyin = NULL;
char *s; /* points to data from environment */ char *s; /* points to data from environment */
int rc; int rc;
#ifdef __MINGW32__
char exepath[256]; /* for constructing config file path */
#endif
if (yyin != stdin) if (yyin != stdin)
return 0; /* we're already ok */ return 0; /* we're already ok */
@ -368,14 +391,14 @@ static int get_config_file()
perror (PROJECT); perror (PROJECT);
return 1; return 1;
} }
new_yyin = fopen (".boxes", "r"); new_yyin = fopen (BOXES_CONFIG, "r");
if (new_yyin) { if (new_yyin) {
rc = is_dir (".boxes"); rc = is_dir (BOXES_CONFIG);
if (rc == -1) if (rc == -1)
return 1; return 1;
else { else {
if (rc == 0) { if (rc == 0) {
yyfilename = (char *) strdup (".boxes"); yyfilename = (char *) strdup (BOXES_CONFIG);
if (yyfilename == NULL) { if (yyfilename == NULL) {
perror (PROJECT); perror (PROJECT);
return 1; return 1;
@ -391,15 +414,45 @@ static int get_config_file()
} }
} }
else { else {
#ifndef __MINGW32__
/* Do not print this warning on windows. */
fprintf (stderr, "%s: warning: Environment variable HOME not set!\n", fprintf (stderr, "%s: warning: Environment variable HOME not set!\n",
PROJECT); PROJECT);
#endif
} }
/* /*
* Try reading the system-wide config file * Try reading the system-wide config file
* On UNIX, the global config file must be given by the GLOBALCONF macro.
* On Win32, it is expected to reside in the same directory as the binary
* used, and its name is assumed to be execfilename+".cfg".
*/ */
#ifdef __MINGW32__
if (GetModuleFileName (NULL, exepath, 255) != 0) {
char *p = strrchr (exepath, '.') + 1;
if (p) {
/* p is always != NULL, because we get the full path */
*p = '\0';
if (strlen(exepath) < 253) {
strcat (exepath, "cfg"); /* c:\blah\boxes.cfg */
}
else {
fprintf (stderr, "%s: path too long. Using C:\\boxes.cfg.\n", PROJECT);
strcpy (exepath, "C:\\boxes.cfg");
}
}
}
else {
strcpy (exepath, "C:\\boxes.cfg");
}
new_yyin = fopen (exepath, "r");
#else
new_yyin = fopen (GLOBALCONF, "r"); new_yyin = fopen (GLOBALCONF, "r");
#endif
if (new_yyin) { if (new_yyin) {
#ifdef __MINGW32__
yyfilename = (char *) strdup (exepath);
#else
rc = is_dir (GLOBALCONF); rc = is_dir (GLOBALCONF);
if (rc == -1) if (rc == -1)
return 1; return 1;
@ -409,6 +462,7 @@ static int get_config_file()
return 1; return 1;
} }
yyfilename = (char *) strdup (GLOBALCONF); yyfilename = (char *) strdup (GLOBALCONF);
#endif
if (yyfilename == NULL) { if (yyfilename == NULL) {
perror (PROJECT); perror (PROJECT);
return 1; return 1;