From 15ae50ca5203bc4c04567e400ba041a4d1757b2b Mon Sep 17 00:00:00 2001 From: Samba Release Account Date: Thu, 24 Jul 1997 17:25:11 +0000 Subject: Makefile: Added UNIXWARE 2.x with shadow passwords from fja@extratech.com client.c: Made prompt appear at debug level 0. Fixed strcasecmp redefinition. Caused client to use set_blocking rather than making fcntl calls itself. dir.c: Removed redundent snum parameters. includes.h: Added SCO fixes. loadparm.c: Made default 'files to hide' a null string. nmbd.c: Removed O_NONBLOCK from pid file open for platforms that dont have it. proto.h: Changed snum to cnum where needed. Changed is_xx_path to is_in_path (now called via MACRO). quotas.c: Swapped setuid/seteuid calls when restoring uid. reply.c: Removed redundent snum parameters. server.c: Changed snum to cnum where needed. Setup new veto_list, hide_list namelists. Added standard_sub changes from Stefaan A Eeckels and Paul Rippin shmem.c: Changed cast for sizeof to be int before negating. smb.h: Added new veto_list, hide_list entries to connections. Added IS_PRINT, IS_HIDDEN_PATH, IS_VETO_PATH macros. trans2.c: Removed redundent snum parameters. util.c: Added standard_sub_basic changes from Stefaan A Eeckels and Paul Rippin Fixed up veto/hidden path processing so the paths are pres-parsed and checked for wildcards (for speed). Jeremy (jallison@whistle.com) (This used to be commit 9afa36f7874cfd527aa6ef1e7965c1d35d46ab1f) --- source3/client/client.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'source3/client/client.c') diff --git a/source3/client/client.c b/source3/client/client.c index dd739fdfa5..c52815c25b 100644 --- a/source3/client/client.c +++ b/source3/client/client.c @@ -845,7 +845,7 @@ else if( offset >= rdrcnt ) { - DEBUG(1,("bad char ptr: datap=%u, converter=%u, rdata=%u, rdrcnt=%d>", datap, converter, (unsigned)rdata, rdrcnt)); + DEBUG(1,("bad char ptr: datap=%u, converter=%u, rdata=%lu, rdrcnt=%d>", datap, converter, (unsigned long)rdata, rdrcnt)); return ""; } else @@ -3689,8 +3689,13 @@ try and browse available connections on a host static BOOL browse_host(BOOL sort) { #ifdef NOSTRCASECMP +/* If strcasecmp is already defined, remove it. */ +#ifdef strcasecmp +#undef strcasecmp +#endif /* strcasecmp */ #define strcasecmp StrCaseCmp -#endif +#endif /* NOSTRCASECMP */ + extern int strcasecmp(); char *rparam = NULL; @@ -4190,13 +4195,11 @@ static void wait_keyboard(char *buffer) #else { char ch; - int f_flags; int readret; - - f_flags = fcntl(fileno(stdin), F_GETFL, 0); - fcntl( fileno(stdin), F_SETFL, f_flags | O_NONBLOCK); + + set_blocking(fileno(stdin), False); readret = read_data( fileno(stdin), &ch, 1); - fcntl(fileno(stdin), F_SETFL, f_flags); + set_blocking(fileno(stdin), True); if (readret == -1) { if (errno != EAGAIN) @@ -4322,7 +4325,7 @@ static BOOL process(char *base_directory) bzero(OutBuffer,smb_size); /* display a prompt */ - DEBUG(1,("smb: %s> ", CNV_LANG(cur_dir))); + DEBUG(0,("smb: %s> ", CNV_LANG(cur_dir))); fflush(dbf); #ifdef CLIX -- cgit