[SCM] Samba Shared Repository - branch v3-6-test updated
Günther Deschner
gd at samba.org
Mon Feb 14 06:33:38 MST 2011
The branch, v3-6-test has been updated
via 8e8ef45 s4-readline: remove leftover from readline merge.
via 05e221f s3-waf: add UTIL_TEVENT subsystem (as in ../lib/util/wscript)
from ae4aa2e s3-librpc: no need to globally include endpointmapper headers.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -----------------------------------------------------------------
commit 8e8ef4538485e8b26dc643064ecdd6d9ca2683eb
Author: Günther Deschner <gd at samba.org>
Date: Mon Feb 14 13:37:59 2011 +0100
s4-readline: remove leftover from readline merge.
Guenther
Autobuild-User: Günther Deschner <gd at samba.org>
Autobuild-Date: Mon Feb 14 14:26:12 CET 2011 on sn-devel-104
(cherry picked from commit d3c082e53984fa8069180ed712030f8bd2a109ca)
commit 05e221fbcf67135dbb737389c4e3514fcfc6bede
Author: Günther Deschner <gd at samba.org>
Date: Tue Feb 8 08:56:45 2011 +0100
s3-waf: add UTIL_TEVENT subsystem (as in ../lib/util/wscript)
Guenther
(cherry picked from commit 89db591b2a79a85cc9127c67a2697bbc6f326ec6)
-----------------------------------------------------------------------
Summary of changes:
lib/async_req/wscript_build | 3 +-
source3/wscript_build | 13 +++-
source4/lib/smbreadline/smbreadline.c | 126 ---------------------------------
3 files changed, 11 insertions(+), 131 deletions(-)
delete mode 100644 source4/lib/smbreadline/smbreadline.c
Changeset truncated at 500 lines:
diff --git a/lib/async_req/wscript_build b/lib/async_req/wscript_build
index f3ac7f0..352861c 100644
--- a/lib/async_req/wscript_build
+++ b/lib/async_req/wscript_build
@@ -3,6 +3,7 @@
bld.SAMBA_SUBSYSTEM('LIBASYNC_REQ',
source='async_sock.c',
- public_deps='talloc tevent'
+ public_deps='talloc tevent',
+ deps='UTIL_TEVENT'
)
diff --git a/source3/wscript_build b/source3/wscript_build
index 5b15182..a0b3006 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -67,9 +67,6 @@ UTIL_SRC = '''
../lib/util/smb_threads.c
../lib/util/system.c
../lib/util/talloc_stack.c
- ../lib/util/tevent_ntstatus.c
- ../lib/util/tevent_unix.c
- ../lib/util/tevent_werror.c
../lib/util/time.c
../lib/util/util.c
../lib/util/util_file.c
@@ -969,6 +966,14 @@ bld.SAMBA_SUBSYSTEM('UTIL_TDB',
public_deps='tdb talloc'
)
+bld.SAMBA_SUBSYSTEM('UTIL_TEVENT',
+ source='../lib/util/tevent_unix.c ../lib/util/tevent_ntstatus.c ../lib/util/tevent_werror.c',
+ local_include=False,
+ public_deps='tevent',
+ public_headers='../lib/util/tevent_ntstatus.h ../lib/util/tevent_unix.h ../lib/util/tevent_werror.h',
+ header_path=[ ('*', 'util') ],
+ )
+
bld.SAMBA_SUBSYSTEM('LIBNET',
source=LIBNET_SRC,
deps='NDR_LIBNET_JOIN',
@@ -1056,7 +1061,7 @@ bld.SAMBA_SUBSYSTEM('ndr-standard',
vars=locals())
#FIXME
-bld.SAMBA_SUBSYSTEM('dcerpc', '')
+bld.SAMBA_SUBSYSTEM('dcerpc', '', deps='UTIL_TEVENT')
bld.SAMBA_SUBSYSTEM('ldb',
source='lib/ldb_compat.c')
diff --git a/source4/lib/smbreadline/smbreadline.c b/source4/lib/smbreadline/smbreadline.c
deleted file mode 100644
index fa59e5d..0000000
--- a/source4/lib/smbreadline/smbreadline.c
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- Unix SMB/CIFS implementation.
- Samba readline wrapper implementation
- Copyright (C) Simo Sorce 2001
- Copyright (C) Andrew Tridgell 2001
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "includes.h"
-#include "system/filesys.h"
-#include "system/select.h"
-#include "system/readline.h"
-#include "lib/smbreadline/smbreadline.h"
-
-/****************************************************************************
- Display the prompt and wait for input. Call callback() regularly
-****************************************************************************/
-
-static char *smb_readline_replacement(const char *prompt, void (*callback)(void),
- char **(completion_fn)(const char *text, int start, int end))
-{
- fd_set fds;
- char *line;
- struct timeval timeout;
- int fd = STDIN_FILENO;
- char *ret;
-
- printf("%s", prompt);
- fflush(stdout);
-
- line = (char *)malloc(BUFSIZ);
- if (!line) {
- return NULL;
- }
-
- while (1) {
- timeout.tv_sec = 5;
- timeout.tv_usec = 0;
-
- FD_ZERO(&fds);
- FD_SET(fd,&fds);
-
- if (sys_select_intr(fd+1,&fds,NULL,NULL,&timeout) == 1) {
- ret = x_fgets(line, BUFSIZ, x_stdin);
- return ret;
- }
- if (callback)
- callback();
- }
-}
-
-/****************************************************************************
- Display the prompt and wait for input. Call callback() regularly.
-****************************************************************************/
-
-char *smb_readline(const char *prompt, void (*callback)(void),
- char **(completion_fn)(const char *text, int start, int end))
-{
-#if HAVE_LIBREADLINE
- if (isatty(STDIN_FILENO)) {
- char *ret;
-
- /* Aargh! Readline does bizzare things with the terminal width
- that mucks up expect(1). Set CLI_NO_READLINE in the environment
- to force readline not to be used. */
-
- if (getenv("CLI_NO_READLINE"))
- return smb_readline_replacement(prompt, callback, completion_fn);
-
- if (completion_fn) {
- /* The callback prototype has changed slightly between
- different versions of Readline, so the same function
- works in all of them to date, but we get compiler
- warnings in some. */
- rl_attempted_completion_function = RL_COMPLETION_CAST completion_fn;
- }
-
-#if HAVE_DECL_RL_EVENT_HOOK
- if (callback)
- rl_event_hook = (Function *)callback;
-#endif
- ret = readline(prompt);
- if (ret && *ret)
- add_history(ret);
- return ret;
- } else
-#endif
- return smb_readline_replacement(prompt, callback, completion_fn);
-}
-
-/****************************************************************************
- * return line buffer text
- ****************************************************************************/
-const char *smb_readline_get_line_buffer(void)
-{
-#if defined(HAVE_LIBREADLINE)
- return rl_line_buffer;
-#else
- return NULL;
-#endif
-}
-
-/****************************************************************************
- * set completion append character
- ***************************************************************************/
-void smb_readline_ca_char(char c)
-{
-#if defined(HAVE_LIBREADLINE)
- rl_completion_append_character = c;
-#endif
-}
-
-
-
--
Samba Shared Repository
More information about the samba-cvs
mailing list