fwd-port win32 isprint fix

svn:r3410

diff --git a/src/common/compat.h b/src/common/compat.h
index 186416d8825b885091a9e665df5f23ddad0b3715..e10a6b620d83c5e9751b8e4a2013b89be82bf016 100644 (file)
--- a/src/common/compat.h
+++ b/src/common/compat.h
@@ -85,6 +85,7 @@ int tor_vsnprintf(char *str, size_t size, const char *format, va_list args);
 #define TOR_ISSPACE(c)   isspace((int)(unsigned char)(c))
 #define TOR_ISXDIGIT(c) isxdigit((int)(unsigned char)(c))
 #define TOR_ISDIGIT(c)   isdigit((int)(unsigned char)(c))
+#define TOR_ISPRINT(c)   isprint((int)(unsigned char)(c))
 
 #define _SHORT_FILE_ (_tor_fix_source_file(__FILE__))
 const char *_tor_fix_source_file(const char *fname);

diff --git a/src/or/directory.c b/src/or/directory.c
index 6fabc52450a579a5d2a291f67304ca66af579deb..446c9eda736d5e8877909f1f0623dba7c4dbc6dc 100644 (file)
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -566,7 +566,7 @@ body_is_plausible(const char *body, size_t len, int purpose)
         !strcmpstart(body,"running-routers"))
     return 1;
     for (i=0;i<32;++i) {
-      if (!isprint(body[i]) && !isspace(body[i]))
+      if (!TOR_ISPRINT(body[i]) && !TOR_ISSPACE(body[i]))
         return 0;
     }
     return 1;