@@ -782,6 +782,16 @@ char_class (const unsigned char c, const unsigned int flags)

     return true;

   if ((flags & CC_EQUAL) && c == '=')

     return true;

+  if ((flags & CC_LESS_THAN) && c == '<')

+    return true;

+  if ((flags & CC_GREATER_THAN) && c == '>')

+    return true;

+  if ((flags & CC_PIPE) && c == '|')

+    return true;

+  if ((flags & CC_QUESTION_MARK) && c == '?')

+    return true;

+  if ((flags & CC_ASTERISK) && c == '*')

+    return true;

   return false;

 }

@@ -736,6 +736,11 @@ const char *np (const char *str);

 #define CC_REVERSE_QUOTE      (1<<23)

 #define CC_AT                 (1<<24)

 #define CC_EQUAL              (1<<25)

+#define CC_LESS_THAN          (1<<26)

+#define CC_GREATER_THAN       (1<<27)

+#define CC_PIPE               (1<<28)

+#define CC_QUESTION_MARK      (1<<29)

+#define CC_ASTERISK           (1<<30)

 /* macro classes */

 #define CC_NAME               (CC_ALNUM|CC_UNDERBAR)

@@ -1056,7 +1056,13 @@ hostname_randomize(const char *hostname, struct gc_arena *gc)

 const char *

 gen_path (const char *directory, const char *filename, struct gc_arena *gc)

 {

-  const char *safe_filename = string_mod_const (filename, CC_ALNUM|CC_UNDERBAR|CC_DASH|CC_DOT|CC_AT, 0, '_', gc);

+#if WIN32

+  const int CC_PATH_RESERVED = CC_LESS_THAN|CC_GREATER_THAN|CC_COLON|

+    CC_DOUBLE_QUOTE|CC_SLASH|CC_BACKSLASH|CC_PIPE|CC_QUESTION_MARK|CC_ASTERISK;

+#else

+  const int CC_PATH_RESERVED = CC_SLASH;

+#endif

+  const char *safe_filename = string_mod_const (filename, CC_PRINT, CC_PATH_RESERVED, '_', gc);

   if (safe_filename

       && strcmp (safe_filename, ".")