Bug#18367457: DON'T USE #DEFINE TO REPLACE POSIX FUNCTIONS WITH WINDOWS EQUIVALENTS

Rather than globally doing #define posix_function_name windows_equivalent
this patch adds inline functions which calls the appropriate function.
This avoids polluting the global namespace.

Author: jhauglid

client/mysql.cc

@@ -1323,7 +1323,7 @@ int main(int argc,char *argv[])
 
   put_info("Welcome to the MySQL monitor.  Commands end with ; or \\g.",
 	   INFO_INFO);
-  snprintf((char*) glob_buffer.ptr(), glob_buffer.alloced_length(),
+  my_snprintf((char*) glob_buffer.ptr(), glob_buffer.alloced_length(),
 	   "Your MySQL connection id is %lu\nServer version: %s\n",
 	   mysql_thread_id(&mysql), server_version_string(&mysql));
   put_info((char*) glob_buffer.ptr(),INFO_INFO);
@@ -3370,7 +3370,7 @@ static int com_server_help(String *buffer __attribute__((unused)),
     else
     {
       put_info("\nNothing found", INFO_INFO);
-      if (strncasecmp(server_cmd, "help 'contents'", 15) == 0)
+      if (native_strncasecmp(server_cmd, "help 'contents'", 15) == 0)
       {
          put_info("\nPlease check if 'help tables' are loaded.\n", INFO_INFO); 
          goto err;

client/mysql_plugin.c

@@ -23,6 +23,10 @@
 #include <stdio.h>
 #include <string.h>
 
+#ifdef _WIN32
+#define popen _popen
+#define pclose _pclose
+#endif
 
 #define SHOW_VERSION "1.0.0"
 #define PRINT_VERSION do { printf("%s  Ver %s Distrib %s\n",    \
@@ -187,7 +191,7 @@ static char *get_value(char *line, const char *item)
   int item_len= (int)strlen(item);
   int line_len = (int)strlen(line);
 
-  if ((strncasecmp(line, item, item_len) == 0))
+  if ((native_strncasecmp(line, item, item_len) == 0))
   {
     int start= 0;
     char *s= 0;
@@ -290,11 +294,11 @@ static char *add_quotes(const char *path)
   char windows_cmd_friendly[FN_REFLEN];
 
   if (has_spaces(path))
-    snprintf(windows_cmd_friendly, sizeof(windows_cmd_friendly),
-             "\"%s\"", path);
+    my_snprintf(windows_cmd_friendly, sizeof(windows_cmd_friendly),
+                "\"%s\"", path);
   else
-    snprintf(windows_cmd_friendly, sizeof(windows_cmd_friendly),
-             "%s", path);
+    my_snprintf(windows_cmd_friendly, sizeof(windows_cmd_friendly),
+                "%s", path);
   return my_strdup(PSI_NOT_INSTRUMENTED,
                    windows_cmd_friendly, MYF(MY_FAE));
 }
@@ -343,16 +347,16 @@ static int get_default_values()
       else
         format_str = "%s mysqld > %s";
 
-      snprintf(defaults_cmd, sizeof(defaults_cmd), format_str,
-               add_quotes(tool_path), add_quotes(defaults_file));
+      my_snprintf(defaults_cmd, sizeof(defaults_cmd), format_str,
+                  add_quotes(tool_path), add_quotes(defaults_file));
       if (opt_verbose)
       {
         printf("# my_print_defaults found: %s\n", tool_path);
       }
     }
 #else
-    snprintf(defaults_cmd, sizeof(defaults_cmd),
-             "%s mysqld > %s", tool_path, defaults_file);
+    my_snprintf(defaults_cmd, sizeof(defaults_cmd),
+                "%s mysqld > %s", tool_path, defaults_file);
 #endif
 
     /* Execute the command */
@@ -780,29 +784,29 @@ static int check_options(int argc, char **argv, char *operation)
     {
       continue;
     }
-    if ((strcasecmp(argv[i], "ENABLE") == 0) ||
-        (strcasecmp(argv[i], "DISABLE") == 0))
+    if ((native_strcasecmp(argv[i], "ENABLE") == 0) ||
+        (native_strcasecmp(argv[i], "DISABLE") == 0))
     {
       strcpy(operation, argv[i]);
       num_found++;
     }
-    else if ((strncasecmp(argv[i], basedir_prefix, basedir_len) == 0) &&
+    else if ((native_strncasecmp(argv[i], basedir_prefix, basedir_len) == 0) &&
              !opt_basedir)
     {
       opt_basedir= my_strndup(PSI_NOT_INSTRUMENTED,
                               argv[i]+basedir_len,
                               strlen(argv[i])-basedir_len, MYF(MY_FAE));
       num_found++;
     }
-    else if ((strncasecmp(argv[i], datadir_prefix, datadir_len) == 0) &&
+    else if ((native_strncasecmp(argv[i], datadir_prefix, datadir_len) == 0) &&
              !opt_datadir)
     {
       opt_datadir= my_strndup(PSI_NOT_INSTRUMENTED,
                               argv[i]+datadir_len,
                               strlen(argv[i])-datadir_len, MYF(MY_FAE));
       num_found++;
     }
-    else if ((strncasecmp(argv[i], plugin_dir_prefix, plugin_dir_len) == 0) &&
+    else if ((native_strncasecmp(argv[i], plugin_dir_prefix, plugin_dir_len) == 0) &&
              !opt_plugin_dir)
     {
       opt_plugin_dir= my_strndup(PSI_NOT_INSTRUMENTED,
@@ -843,7 +847,7 @@ static int check_options(int argc, char **argv, char *operation)
     {
       return 1;
     }
-    if (strcasecmp(plugin_data.name, plugin_name) != 0)
+    if (native_strcasecmp(plugin_data.name, plugin_name) != 0)
     {
       fprintf(stderr, "ERROR: plugin name requested does not match config "
               "file data.\n");
@@ -1117,7 +1121,7 @@ static int build_bootstrap_file(char *operation, char *bootstrap)
     error= 1;
     goto exit;
   }
-  if (strcasecmp(operation, "enable") == 0)
+  if (native_strcasecmp(operation, "enable") == 0)
   {
     int i= 0;
     fprintf(file, "REPLACE INTO mysql.plugin VALUES ");
@@ -1239,14 +1243,14 @@ static int bootstrap_server(char *server_path, char *bootstrap_file)
   else 
     format_str= "%s %s --bootstrap --datadir=%s --basedir=%s < %s";
 
-  snprintf(bootstrap_cmd, sizeof(bootstrap_cmd), format_str,
-           add_quotes(convert_path(server_path)), verbose_str,
-           add_quotes(opt_datadir), add_quotes(opt_basedir),
-           add_quotes(bootstrap_file));
+  my_snprintf(bootstrap_cmd, sizeof(bootstrap_cmd), format_str,
+              add_quotes(convert_path(server_path)), verbose_str,
+              add_quotes(opt_datadir), add_quotes(opt_basedir),
+              add_quotes(bootstrap_file));
 #else
-  snprintf(bootstrap_cmd, sizeof(bootstrap_cmd),
-           "%s --no-defaults --bootstrap --datadir=%s --basedir=%s"
-           " < %s", server_path, opt_datadir, opt_basedir, bootstrap_file);
+  my_snprintf(bootstrap_cmd, sizeof(bootstrap_cmd),
+              "%s --no-defaults --bootstrap --datadir=%s --basedir=%s"
+              " < %s", server_path, opt_datadir, opt_basedir, bootstrap_file);
 #endif
 
   /* Execute the command */

client/mysql_upgrade.c

@@ -36,6 +36,11 @@
 # endif
 #endif
 
+#ifdef _WIN32
+#define popen _popen
+#define pclose _pclose
+#endif
+
 static char mysql_path[FN_REFLEN];
 static char mysqlcheck_path[FN_REFLEN];
 

client/mysqladmin.cc

@@ -801,7 +801,7 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv)
           /* We don't use mysql_kill(), since it only handles 32-bit IDs. */
           char buff[26], *out; /* "KILL " + max 20 digs + NUL */
           out= strxmov(buff, "KILL ", NullS);
-          ullstr(strtoull(pos, NULL, 0), out);
+          ullstr(my_strtoull(pos, NULL, 0), out);
 
           if (mysql_query(mysql, buff))
 	  {
@@ -1348,7 +1348,7 @@ static void print_relative_row(MYSQL_RES *result, MYSQL_ROW cur, uint row)
   printf("| %-*s|", (int) field->max_length + 1, cur[0]);
 
   field = mysql_fetch_field(result);
-  tmp = cur[1] ? strtoull(cur[1], NULL, 10) : (ulonglong) 0;
+  tmp = cur[1] ? my_strtoull(cur[1], NULL, 10) : (ulonglong) 0;
   printf(" %-*s|\n", (int) field->max_length + 1,
 	 llstr((tmp - last_values[row]), buff));
   last_values[row] = tmp;
@@ -1366,7 +1366,7 @@ static void print_relative_row_vert(MYSQL_RES *result __attribute__((unused)),
   if (!row)
     putchar('|');
 
-  tmp = cur[1] ? strtoull(cur[1], NULL, 10) : (ulonglong) 0;
+  tmp = cur[1] ? my_strtoull(cur[1], NULL, 10) : (ulonglong) 0;
   printf(" %-*s|", ex_val_max_len[row] + 1,
 	 llstr((tmp - last_values[row]), buff));
 
@@ -1391,7 +1391,7 @@ static void store_values(MYSQL_RES *result)
   for (i = 0; (row = mysql_fetch_row(result)); i++)
   {
     my_stpcpy(ex_var_names[i], row[0]);
-    last_values[i]=strtoull(row[1],NULL,10);
+    last_values[i]= my_strtoull(row[1],NULL,10);
     ex_val_max_len[i]=2;		/* Default print width for values */
   }
   ex_var_count = i;

client/mysqlimport.c

@@ -318,7 +318,7 @@ static int write_to_table(char *filename, MYSQL *mysql)
   {
     if (verbose)
       fprintf(stdout, "Deleting the old data from table %s\n", tablename);
-    snprintf(sql_statement, FN_REFLEN*16+256, "DELETE FROM %s", tablename);
+    my_snprintf(sql_statement, FN_REFLEN*16+256, "DELETE FROM %s", tablename);
     if (mysql_query(mysql, sql_statement))
     {
       db_error_with_table(mysql, tablename);

client/mysqlshow.c

@@ -451,7 +451,7 @@ list_dbs(MYSQL *mysql,const char *wild)
 		if ((rresult = mysql_store_result(mysql)))
 		{
 		  rrow = mysql_fetch_row(rresult);
-		  rowcount += (ulong) strtoull(rrow[0], (char**) 0, 10);
+		  rowcount += (ulong) my_strtoull(rrow[0], (char**) 0, 10);
 		  mysql_free_result(rresult);
 		}
 	      }
@@ -592,7 +592,7 @@ list_tables(MYSQL *mysql,const char *db,const char *table)
 	      if ((rresult = mysql_store_result(mysql)))
 	      {
 		rrow = mysql_fetch_row(rresult);
-		rowcount += (unsigned long) strtoull(rrow[0], (char**) 0, 10);
+		rowcount += (unsigned long) my_strtoull(rrow[0], (char**) 0, 10);
 		mysql_free_result(rresult);
 	      }
 	      sprintf(rows,"%10lu",rowcount);
@@ -709,7 +709,7 @@ list_fields(MYSQL *mysql,const char *db,const char *table,
       return 1;
     }
     row= mysql_fetch_row(result);
-    rows= (ulong) strtoull(row[0], (char**) 0, 10);
+    rows= (ulong) my_strtoull(row[0], (char**) 0, 10);
     mysql_free_result(result);
   }
 

client/mysqltest.cc

@@ -62,6 +62,8 @@ using std::max;
 
 #ifdef _WIN32
 #define setenv(a,b,c) _putenv_s(a,b)
+#define popen _popen
+#define pclose _pclose
 #endif
 
 #define MAX_VAR_NAME_LENGTH    256
@@ -1293,7 +1295,7 @@ void handle_command_error(struct st_command *command, uint error)
   {
     const char var_name[]= "__error";
     char buf[10];
-    int err_len= snprintf(buf, 10, "%u", error);
+    int err_len= my_snprintf(buf, 10, "%u", error);
     buf[err_len > 9 ? 9 : err_len]= '0';
     var_set(var_name, var_name + 7, buf, buf + err_len);
   }
@@ -3245,7 +3247,7 @@ void do_exec(struct st_command *command)
   {
     const char var_name[]= "__error";
     char buf[10];
-    int err_len= snprintf(buf, 10, "%u", error);
+    int err_len= my_snprintf(buf, 10, "%u", error);
     buf[err_len > 9 ? 9 : err_len]= '0';
     var_set(var_name, var_name + 7, buf, buf + err_len);
   }
@@ -4516,7 +4518,7 @@ int do_save_master_pos()
 	    if (*status)
 	    {
 	      status+= sizeof(latest_trans_epoch_str)-1;
-	      latest_trans_epoch= strtoull(status, (char**) 0, 10);
+	      latest_trans_epoch= my_strtoull(status, (char**) 0, 10);
 	    }
 	    else
 	      die("result does not contain '%s' in '%s'",
@@ -4530,7 +4532,7 @@ int do_save_master_pos()
 	    if (*status)
 	    {
 	      status+= sizeof(latest_handled_binlog_epoch_str)-1;
-	      latest_handled_binlog_epoch= strtoull(status, (char**) 0, 10);
+	      latest_handled_binlog_epoch= my_strtoull(status, (char**) 0, 10);
 	    }
 	    else
 	      die("result does not contain '%s' in '%s'",

cmake/os/Windows.cmake

@@ -49,8 +49,6 @@ ELSE()
   SET(SYSTEM_TYPE "Win32")
 ENDIF()
 
-ADD_DEFINITIONS("-D_CRT_SECURE_NO_DEPRECATE")
-
 # Target Windows Vista or later, i.e _WIN32_WINNT_VISTA
 ADD_DEFINITIONS("-D_WIN32_WINNT=0x0600")
 SET(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -D_WIN32_WINNT=0x0600")
@@ -177,43 +175,6 @@ IF(NOT HAVE_ISNAN)
   CHECK_SYMBOL_REPLACEMENT(isnan _isnan float.h)
 ENDIF()
 
-# See http://msdn.microsoft.com/en-us/library/ms235384.aspx
-# about POSIX functions and their Windows replacements
-
-# Windows replacement functions.
-SET(alloca _alloca)
-SET(finite _finite)
-SET(popen _popen)
-SET(pclose _pclose)
-SET(strcasecmp _stricmp)
-SET(strncasecmp _strnicmp)
-SET(strtoll _strtoi64)
-SET(strtoull _strtoui64)
-SET(snprintf _snprintf)
-SET(vsnprintf _vsnprintf)
-
-# Windows replacement functions where the POSIX name is deprecated.
-SET(access _access)
-SET(chdir _chdir)
-SET(chmod _chmod)
-SET(dup _dup)
-SET(fdopen _fdopen)
-SET(fileno _fileno)
-SET(getcwd _getcwd)
-SET(isatty _isatty)
-SET(mkdir _mkdir)
-SET(putenv _putenv)
-SET(read _read)
-SET(rmdir _rmdir)
-SET(strdup _strdup)
-SET(stricmp _stricmp)
-SET(tzset _tzset)
-SET(umask _umask)
-SET(unlink _unlink)
-
-# Windows security enchanced replacement functions.
-SET(strtok_r strtok_s)
-
 CHECK_TYPE_SIZE(ssize_t SIZE_OF_SSIZE_T)
 IF(NOT HAVE_SIZE_OF_SSIZE_T)
  SET(ssize_t SSIZE_T)

config.h.cmake

@@ -317,37 +317,6 @@
 #cmakedefine SIGPIPE @SIGPIPE@
 #cmakedefine isnan @isnan@
 
-#cmakedefine alloca @alloca@
-#cmakedefine finite @finite@
-#cmakedefine popen @popen@
-#cmakedefine pclose @pclose@
-#cmakedefine strcasecmp @strcasecmp@
-#cmakedefine strncasecmp @strncasecmp@
-#cmakedefine strtoll @strtoll@
-#cmakedefine strtoull @strtoull@
-#cmakedefine snprintf @snprintf@
-#cmakedefine vsnprintf @vsnprintf@
-
-#cmakedefine access @access@
-#cmakedefine chdir @chdir@
-#cmakedefine chmod @chmod@
-#cmakedefine dup @dup@
-#cmakedefine fdopen @fdopen@
-#cmakedefine fileno @fileno@
-#cmakedefine getcwd @getcwd@
-#cmakedefine isatty @isatty@
-#cmakedefine mkdir @mkdir@
-#cmakedefine putenv @putenv@
-#cmakedefine read @read@
-#cmakedefine rmdir @rmdir@
-#cmakedefine strdup @strdup@
-#cmakedefine stricmp @stricmp@
-#cmakedefine tzset @tzset@
-#cmakedefine umask @umask@
-#cmakedefine unlink @unlink@
-
-#cmakedefine strtok_r @strtok_r@
-
 #cmakedefine ssize_t @ssize_t@
 
 /*

extra/yassl/src/ssl.cpp

@@ -1696,7 +1696,11 @@ unsigned long ERR_get_error()
       };
 
       TaoCrypt::ASN1_TIME_extract(time->data, time->type, &t);
+#ifdef _WIN32
+      _snprintf(buf, len, "%s %2d %02d:%02d:%02d %d GMT",
+#else
       snprintf(buf, len, "%s %2d %02d:%02d:%02d %d GMT",
+#endif
                month_names[t.tm_mon], t.tm_mday, t.tm_hour, t.tm_min, 
                t.tm_sec, t.tm_year + 1900);
       return buf;