From: Andrew Bartlett <abartlet@samba.org>
Date: Tue, 21 May 2019 02:59:00 +0000 (+1200)
Subject: lib: Remove "tdb based replacement for gettext"
X-Git-Tag: ldb-2.0.5~689
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=93db0aac0d3c4c44bcb5b52618705d63b94534cd;p=thirdparty%2Fsamba.git

lib: Remove "tdb based replacement for gettext"

This is unused since SWAT was removed in Samba 4.1

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>
---

diff --git a/source3/intl/lang_tdb.c b/source3/intl/lang_tdb.c
deleted file mode 100644
index 2e050fd96de..00000000000
--- a/source3/intl/lang_tdb.c
+++ /dev/null
@@ -1,263 +0,0 @@
-/* 
-   Unix SMB/CIFS implementation.
-   tdb based replacement for gettext 
-   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 "intl/lang_tdb.h"
-#include "util_tdb.h"
-#include "lib/util/util_paths.h"
-
-static TDB_CONTEXT *tdb;
-
-/* the currently selected language */
-static char *current_lang;
-
-
-/* load a msg file into the tdb */
-static bool load_msg(const char *msg_file)
-{
-	char **lines;
-	int num_lines, i;
-	char *msgid, *msgstr;
-	TDB_DATA data;
-
-	lines = file_lines_load(msg_file, &num_lines, 0, NULL);
-
-	if (!lines) {
-		return False;
-	}
-
-	if (tdb_lockall(tdb) != 0) {
-		TALLOC_FREE(lines);
-		return False;
-	}
-
-	/* wipe the db */
-	tdb_wipe_all(tdb);
-
-	msgid = NULL;
-	
-	for (i=0;i<num_lines;i++) {
-		if (strncmp(lines[i], "msgid \"", 7) == 0) {
-			msgid = lines[i] + 7;
-		}
-		if (msgid && strncmp(lines[i], "msgstr \"", 8) == 0) {
-			msgstr = lines[i] + 8;
-			trim_char(msgid, '\0', '\"');
-			trim_char(msgstr, '\0', '\"');
-			if (*msgstr == 0) {
-				msgstr = msgid;
-			}
-			all_string_sub(msgid, "\\n", "\n", 0);
-			all_string_sub(msgstr, "\\n", "\n", 0);
-			data = string_term_tdb_data(msgstr);
-			tdb_store_bystring(tdb, msgid, data, 0);
-			msgid = NULL;
-		}
-	}
-
-	TALLOC_FREE(lines);
-	tdb_unlockall(tdb);
-
-	return True;
-}
-
-
-/* work out what language to use from locale variables */
-static const char *get_lang(void)
-{
-	const char *vars[] = {"LANGUAGE", "LC_ALL", "LC_LANG", "LANG", NULL};
-	int i;
-	char *p;
-
-	for (i=0; vars[i]; i++) {
-		if ((p = getenv(vars[i]))) {
-			return p;
-		}
-	}
-
-	return NULL;
-}
-
-/* initialise the message translation subsystem. If the "lang" argument
-   is NULL then get the language from the normal environment variables */
-bool lang_tdb_init(const char *lang)
-{
-	char *path = NULL;
-	char *msg_path = NULL;
-	struct stat st;
-	static int initialised;
-	time_t loadtime;
-	bool result = false;
-	char *dpath = NULL;
-	char *lpath = NULL;
-
-	/* we only want to init once per process, unless given
-	   an override */
-	if (initialised && !lang) 
-		return True;
-
-	if (initialised) {
-		/* we are re-initialising, free up any old init */
-		if (tdb) {
-			tdb_close(tdb);
-			tdb = NULL;
-		}
-		SAFE_FREE(current_lang);
-	}
-
-	initialised = 1;
-
-	if (!lang) {
-		/* no lang given, use environment */
-		lang = get_lang();
-	}
-
-	/* if no lang then we don't translate */
-	if (!lang) 
-		return True;
-
-	dpath = data_path(talloc_tos(), (const char *)lang);
-	if (dpath == NULL) {
-		goto done;
-	}
-
-	if (asprintf(&msg_path, "%s.msg", dpath) == -1) {
-		DEBUG(0, ("asprintf failed\n"));
-		goto done;
-	}
-	if (stat(msg_path, &st) != 0) {
-		/* the msg file isn't available */
-		DEBUG(10, ("lang_tdb_init: %s: %s\n", msg_path, 
-			   strerror(errno)));
-		goto done;
-	}
-
-	lpath = lock_path(talloc_tos(), "lang_");
-	if (lpath == NULL) {
-		goto done;
-	}
-
-	if (asprintf(&path, "%s%s.tdb", lpath, lang) == -1) {
-		DEBUG(0, ("asprintf failed\n"));
-		goto done;
-	}
-
-	DEBUG(10, ("lang_tdb_init: loading %s\n", path));
-
-	tdb = tdb_open_log(path, 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0644);
-	if (!tdb) {
-		tdb = tdb_open_log(path, 0, TDB_DEFAULT, O_RDONLY, 0);
-		if (!tdb) {
-			DEBUG(10, ("lang_tdb_init: %s: %s\n", path,
-				   strerror(errno)));
-			goto done;
-		}
-		current_lang = SMB_STRDUP(lang);
-		result = True;
-		goto done;
-	}
-
-	loadtime = tdb_fetch_int32(tdb, "/LOADTIME/");
-
-	if (loadtime == -1 || loadtime < st.st_mtime) {
-		load_msg(msg_path);
-		tdb_store_int32(tdb, "/LOADTIME/", (int)time(NULL));
-	}
-
-	current_lang = SMB_STRDUP(lang);
-	result = True;
-
- done:
-	SAFE_FREE(msg_path);
-	SAFE_FREE(path);
-	TALLOC_FREE(lpath);
-	TALLOC_FREE(dpath);
-
-	return result;
-}
-
-/* translate a msgid to a message string in the current language 
-   returns a string that must be freed by calling lang_msg_free()
-*/
-const char *lang_msg(const char *msgid)
-{
-	TDB_DATA data;
-	const char *p;
-	char *q, *msgid_quoted;
-	int count;
-
-	lang_tdb_init(NULL);
-
-	if (!tdb) return msgid;
-
-	/* Due to the way quotes in msgids are escaped in the msg file we
-	   must replace " with \" before doing a lookup in the tdb. */
-
-	count = 0;
-
-	for(p = msgid; *p; p++) {
-		if (*p == '\"')
-			count++;
-	}
-
-	if (!(msgid_quoted = (char *)SMB_MALLOC(strlen(msgid) + count + 1)))
-		return msgid;
-
-	/* string_sub() is unsuitable here as it replaces some punctuation
-	   chars with underscores. */
-
-	for(p = msgid, q = msgid_quoted; *p; p++) {
-		if (*p == '\"') {
-			*q = '\\';
-			q++;
-		}
-		*q = *p;
-		q++;
-	}
-
-	*q = 0;
-
-	data = tdb_fetch_bystring(tdb, msgid_quoted);
-
-	free(msgid_quoted);
-
-	/* if the message isn't found then we still need to return a pointer
-	   that can be freed. Pity. */
-	if (!data.dptr)
-		return SMB_STRDUP(msgid);
-
-	return (const char *)data.dptr;
-}
-
-
-/* free up a string from lang_msg() */
-void lang_msg_free(const char *msgstr)
-{
-	if (!tdb) return;
-	free(discard_const_p(void, msgstr));
-}
-
-/* 
-   return the current language - needed for language file mappings 
-*/
-char *lang_tdb_current(void)
-{
-	return current_lang;
-}
diff --git a/source3/intl/lang_tdb.h b/source3/intl/lang_tdb.h
deleted file mode 100644
index 2f9c3f19e56..00000000000
--- a/source3/intl/lang_tdb.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-   Unix SMB/CIFS implementation.
-   tdb based replacement for gettext
-   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/>.
-*/
-
-#ifndef _INTL_LANG_TDB_H_
-#define _INTL_LANG_TDB_H_
-
-/* The following definitions come from intl/lang_tdb.c  */
-
-bool lang_tdb_init(const char *lang);
-const char *lang_msg(const char *msgid);
-void lang_msg_free(const char *msgstr);
-char *lang_tdb_current(void);
-
-#endif /* _INTL_LANG_TDB_H_ */
diff --git a/source3/wscript_build b/source3/wscript_build
index fd4101a315f..3a19fd3517c 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -397,7 +397,6 @@ bld.SAMBA3_SUBSYSTEM('samba3core',
                           lib/ms_fnmatch.c
                           lib/tallocmsg.c
                           lib/dmallocmsg.c
-                          intl/lang_tdb.c
                           lib/gencache.c
                           lib/util_event.c
                           lib/global_contexts.c