aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org.ua>2013-05-13 19:37:51 +0000
committerSergey Poznyakoff <gray@gnu.org.ua>2013-05-13 19:37:51 +0000
commitf1a89bc4e380c1fd331f26baa1376233acbc7772 (patch)
tree9649722b2a2a646bb1cbd91aec47b80e71e2f4f5
parent1cc001721ba1923f7e145c74b6b2fa32b36e65da (diff)
downloadgdbm-f1a89bc4e380c1fd331f26baa1376233acbc7772.tar.gz
gdbm-f1a89bc4e380c1fd331f26baa1376233acbc7772.tar.bz2
Remove the "read" command. Use "import" instead.
-rw-r--r--ChangeLog4
-rw-r--r--src/gdbmtool.c73
2 files changed, 4 insertions, 73 deletions
diff --git a/ChangeLog b/ChangeLog
index ca11977..7e8b390 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2013-05-13 Sergey Poznyakoff <gray@gnu.org.ua>
+ Remove the "read" command. Use "import" instead.
+
+2013-05-13 Sergey Poznyakoff <gray@gnu.org.ua>
+
Add "set" and "define" to the main command table.
* src/gdbmtool.c: Include gram.h
diff --git a/src/gdbmtool.c b/src/gdbmtool.c
index 039f149..5e672b2 100644
--- a/src/gdbmtool.c
+++ b/src/gdbmtool.c
@@ -231,59 +231,6 @@ trimnl (char *str)
return 0;
}
-#if 0
-void
-read_from_file (const char *name, int replace)
-{
- int line = 0;
- char buf[1024];
- datum key;
- datum data;
- FILE *fp;
- int flag = replace ? GDBM_REPLACE : 0;
-
- fp = fopen (name, "r");
- if (!fp)
- {
- terror (0, _("cannot open file `%s' for reading: %s"),
- name, strerror (errno));
- return;
- }
-
- while (fgets (buf, sizeof buf, fp))
- {
- char *p;
-
- if (!trimnl (buf))
- {
- terror (0, _("%s:%d: line too long"), name, line);
- continue;
- }
-
- line++;
- p = strchr (buf, ' ');
- if (!p)
- {
- terror (0, _("%s:%d: malformed line"), name, line);
- continue;
- }
-
- for (*p++ = 0; *p && isspace (*p); p++)
- ;
-
- FIXME
- key.dptr = buf;
- key.dsize = strlen (buf) + key_z;
- data.dptr = p;
- data.dsize = strlen (p) + data_z;
- if (gdbm_store (gdbm_file, key, data, flag) != 0)
- terror (0, _("%d: item not inserted: %s"),
- line, gdbm_strerror (gdbm_errno));
- }
- fclose (fp);
-}
-#endif
-
int
get_screen_lines ()
{
@@ -617,17 +564,6 @@ print_version_handler (struct handler_param *param)
fprintf (param->fp, "%s\n", gdbm_version);
}
-#if 0
-FIXME
-/* < file [replace] - read entries from file and store */
-void
-read_handler (struct handler_param *param)
-{
- read_from_file (param->argv[0],
- param->argv[1] && strcmp (param->argv[1], "replace") == 0);
-}
-#endif
-
/* l - List all entries */
int
list_begin (struct handler_param *param ARG_UNUSED, size_t *exp_count)
@@ -827,15 +763,6 @@ struct command command_tab[] = {
{ S(first), T_CMD,
NULL, firstkey_handler, NULL,
{ { NULL } }, N_("firstkey") },
-#if 0
- FIXME
- { S(read), T_CMD,
- NULL, read_handler, NULL,
- { { N_("file"), ARG_STRING },
- { "[replace]", ARG_STRING },
- { NULL } },
- N_("read entries from file and store") },
-#endif
{ S(reorganize), T_CMD,
NULL, reorganize_handler, NULL,
{ { NULL } }, N_("reorganize") },

Return to:

Send suggestions and report system problems to the System administrator.