diff options
| author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-07-15 08:13:30 -0300 |
|---|---|---|
| committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-07-15 08:13:30 -0300 |
| commit | 07e7b4d6fe590cb49a5009842d3153520f2e1a36 (patch) | |
| tree | 2c9b96009bfea8eef82d21e14a61f7306827f917 /libmysql | |
| parent | ef27448469171b0d7a045b19af378af9b514b6af (diff) | |
| download | mariadb-git-07e7b4d6fe590cb49a5009842d3153520f2e1a36.tar.gz | |
WL#5486: Remove code for unsupported platforms
Remove Netware specific code.
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/get_password.c | 14 | ||||
| -rw-r--r-- | libmysql/libmysql.c | 12 |
2 files changed, 4 insertions, 22 deletions
diff --git a/libmysql/get_password.c b/libmysql/get_password.c index cbe5fce6949..56514a8d864 100644 --- a/libmysql/get_password.c +++ b/libmysql/get_password.c @@ -36,7 +36,7 @@ #include <pwd.h> #endif /* HAVE_PWD_H */ #else /* ! HAVE_GETPASS */ -#if !defined(__WIN__) && !defined(__NETWARE__) +#if !defined(__WIN__) #include <sys/ioctl.h> #ifdef HAVE_TERMIOS_H /* For tty-password */ #include <termios.h> @@ -55,9 +55,7 @@ #include <asm/termiobits.h> #endif #else -#ifndef __NETWARE__ #include <conio.h> -#endif /* __NETWARE__ */ #endif /* __WIN__ */ #endif /* HAVE_GETPASS */ @@ -65,16 +63,8 @@ #define getpass(A) getpassphrase(A) #endif -#if defined( __WIN__) || defined(__NETWARE__) +#if defined(__WIN__) /* were just going to fake it here and get input from the keyboard */ - -#ifdef __NETWARE__ -#undef _getch -#undef _cputs -#define _getch getcharacter -#define _cputs(A) putstring(A) -#endif - char *get_tty_password(const char *opt_message) { char to[80]; diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index b69c27731dd..68813937fb6 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -165,7 +165,7 @@ int STDCALL mysql_server_init(int argc __attribute__((unused)), mysql_unix_port = env; } mysql_debug(NullS); -#if defined(SIGPIPE) && !defined(__WIN__) && !defined(__NETWARE__) +#if defined(SIGPIPE) && !defined(__WIN__) (void) signal(SIGPIPE, SIG_IGN); #endif #ifdef EMBEDDED_LIBRARY @@ -479,15 +479,7 @@ struct passwd *getpwuid(uid_t); char* getlogin(void); #endif -#if defined(__NETWARE__) -/* Default to value of USER on NetWare, if unset use "UNKNOWN_USER" */ -void read_user_name(char *name) -{ - char *str=getenv("USER"); - strmake(name, str ? str : "UNKNOWN_USER", USERNAME_LENGTH); -} - -#elif !defined(MSDOS) && ! defined(VMS) && !defined(__WIN__) +#if !defined(MSDOS) && ! defined(VMS) && !defined(__WIN__) void read_user_name(char *name) { |