snapshot of project "lynx", label v2-8-8dev_16w

1 files changed, 28 insertions, 12 deletions

diff --git a/src/LYUtils.h b/src/LYUtils.h
index 3545b6f8..ac6609bb 100644
--- a/src/LYUtils.h
+++ b/src/LYUtils.h
@@ -1,4 +1,4 @@
-/* $LynxId: LYUtils.h,v 1.92 2013/10/19 00:55:45 tom Exp $ */
+/* $LynxId: LYUtils.h,v 1.94 2013/10/23 22:14:03 tom Exp $ */
 #ifndef LYUTILS_H
 #define LYUTILS_H
 
@@ -29,24 +29,31 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+
 #ifdef VMS
 #define HTSYS_name(path)   HTVMS_name("", path)
 #define HTSYS_purge(path)  HTVMS_purge(path)
 #define HTSYS_remove(path) HTVMS_remove(path)
 #endif				/* VMS */
+
 #if defined(USE_DOS_DRIVES)
 #define HTSYS_name(path) HTDOS_name(path)
 #endif
+
 #ifndef HTSYS_name
 #define HTSYS_name(path) path
 #endif
+
 #ifndef HTSYS_purge
 #define HTSYS_purge(path)	/* nothing */
 #endif
+
 #ifndef HTSYS_remove
 #define HTSYS_remove(path) remove(path)
 #endif
+
 #define LYIsPipeCommand(s) ((s)[0] == '|')
+
 #ifdef VMS
 #define TTY_DEVICE "tt:"
 #define NUL_DEVICE "nl:"
@@ -76,23 +83,30 @@ extern "C" {
 #endif				/* __CYGWIN__ */
 #endif				/* DOSPATH */
 #endif				/* VMS */
+
 /* See definitions in src/LYCharVals.h.  The hardcoded values...
    This prohibits binding C-c and C-g.  Maybe it is better to remove this? */
 #define LYCharIsINTERRUPT_HARD(ch)	\
   ((ch) == LYCharINTERRUPT1 || ch == LYCharINTERRUPT2)
+
 #define LYCharIsINTERRUPT(ch)		\
   (LYCharIsINTERRUPT_HARD(ch) || LKC_TO_LAC(keymap,ch) == LYK_INTERRUPT)
+
 #define LYCharIsINTERRUPT_NO_letter(ch)	\
   (LYCharIsINTERRUPT(ch) && !isprint(ch))
+
 #if defined(USE_DOS_DRIVES)
-#define PATHSEP_STR "\\"
+#define PATH_SEPARATOR ";"
+#define FILE_SEPARATOR "\\"
 #define LYIsPathSep(ch) ((ch) == '/' || (ch) == '\\')
 #define LYIsDosDrive(s) (isalpha(UCH((s)[0])) && (s)[1] == ':')
 #else
-#define PATHSEP_STR "/"
+#define PATH_SEPARATOR ":"
+#define FILE_SEPARATOR "/"
 #define LYIsPathSep(ch) ((ch) == '/')
 #define LYIsDosDrive(s) FALSE	/* really nothing */
 #endif
+
 #ifdef USE_ADDRLIST_PAGE
 #define LYIsListpageTitle(name) \
     (!strcmp((name), LIST_PAGE_TITLE) || \
@@ -101,10 +115,12 @@ extern "C" {
 #define LYIsListpageTitle(name) \
     (!strcmp((name), LIST_PAGE_TITLE))
 #endif
+
 #define LYIsTilde(ch)     ((ch) == '~')
 #define LYIsHtmlSep(ch) ((ch) == '/')
 #define findPoundSelector(address) strchr(address, '#')
 #define restorePoundSelector(pound) if ((pound) != NULL) *(pound) = '#'
+
     extern BOOL strn_dash_equ(const char *p1, const char *p2, int len);
     extern BOOLEAN LYAddSchemeForURL(char **AllocatedString, const char *default_scheme);
     extern BOOLEAN LYCachedTemp(char *result, char **cached);
@@ -227,7 +243,7 @@ extern "C" {
     extern int xsystem(char *cmd);
 #endif
 
-/* Keeping track of User Interface Pages: */
+    /* Keeping track of User Interface Pages: */
     typedef enum {
 	UIP_UNKNOWN = -1
 	,UIP_HISTORY = 0
@@ -302,18 +318,18 @@ extern "C" {
     extern int win32_check_interrupt(void);
 #endif
 
-/*
- *  Whether or not the status line must be shown.
- */
+    /*
+     * Whether or not the status line must be shown.
+     */
     extern BOOLEAN mustshow;
 
 #define _statusline(msg)	mustshow = TRUE, statusline(msg)
 
-/*
- *  For is_url().
- *
- *  Universal document id types (see LYCheckForProxyURL)
- */
+    /*
+     * For is_url().
+     *
+     * Universal document id types (see LYCheckForProxyURL)
+     */
     typedef enum {
 	NOT_A_URL_TYPE = 0,
 	UNKNOWN_URL_TYPE = 1,	/* must be nonzero */