aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org.ua>2009-10-12 23:41:21 +0300
committerSergey Poznyakoff <gray@gnu.org.ua>2009-10-12 23:42:04 +0300
commit8a4ba77068e5d7f6eab2cc1c1c10f31dcbccf7a6 (patch)
treec70f38d943c778684bb9dbfc7db018e7efb21bf1 /lib
parentaf04ed630f18e9003756317cc627a11084d0d59a (diff)
downloadpies-8a4ba77068e5d7f6eab2cc1c1c10f31dcbccf7a6.tar.gz
pies-8a4ba77068e5d7f6eab2cc1c1c10f31dcbccf7a6.tar.bz2
Fix make distcheck and check-docs.
* doc/Makefile.am: Fix `check-*' goals. * doc/pies.texi: Update and rearrange material. Document new configuration. * lib/Makefile.am (libpies_a_SOURCES): Remove nls.c * src/Makefile.am (EXTRA_DIST): Remove pies.rc, add pp-setup. (INCLUDES): Add $(top_builddir)/gnu * src/pies.c: Minor changes. * src/progman.c: Minor changes. * README-hacking: New file.
Diffstat (limited to 'lib')
-rw-r--r--lib/Makefile.am3
-rw-r--r--lib/nls.c33
-rw-r--r--lib/strtotok.c77
3 files changed, 77 insertions, 36 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am
index a3ffed2..bbcb054 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -19,7 +19,6 @@ noinst_LIBRARIES=libpies.a
noinst_HEADERS = libpies.h
libpies_a_SOURCES=\
- nls.c\
parsetime.c\
proctitle.c\
strtotok.c
@@ -28,5 +27,3 @@ libpies_a_LIBADD=$(LIBOBJS)
INCLUDES = -I$(top_srcdir)/gnu -I../gnu
-AM_CPPFLAGS=-DLOCALEDIR=\"$(localedir)\"
-
diff --git a/lib/nls.c b/lib/nls.c
deleted file mode 100644
index b42192f..0000000
--- a/lib/nls.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/* This file is part of Pies.
- Copyright (C) 2009 Sergey Poznyakoff
-
- Pies 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, or (at your option)
- any later version.
-
- Pies 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 Pies. If not, see <http://www.gnu.org/licenses/>. */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-#include <libpies.h>
-#include <locale.h>
-#include <mailutils/nls.h>
-
-void
-mf_init_nls ()
-{
-#ifdef ENABLE_NLS
- setlocale (LC_ALL, "");
- bindtextdomain (PACKAGE, LOCALEDIR);
- bindtextdomain ("mailfromd", LOCALEDIR);
- textdomain (PACKAGE);
-#endif
-}
diff --git a/lib/strtotok.c b/lib/strtotok.c
new file mode 100644
index 0000000..116c96e
--- /dev/null
+++ b/lib/strtotok.c
@@ -0,0 +1,77 @@
+/* This file is part of Pies.
+ Copyright (C) 2009 Sergey Poznyakoff
+
+ Pies 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, or (at your option)
+ any later version.
+
+ Pies 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 Pies. If not, see <http://www.gnu.org/licenses/>. */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <string.h>
+#include "libpies.h"
+#include "c-strcase.h"
+
+int
+strtotok_len (struct tokendef *tab, const char *str, size_t len, int *pres)
+{
+ for (; tab->name; tab++)
+ {
+ size_t kwlen = strlen (tab->name);
+ if (kwlen == len && memcmp (tab->name, str, len) == 0)
+ {
+ *pres = tab->tok;
+ return 0;
+ }
+ }
+ return 1;
+}
+
+int
+strtotok_len_ci (struct tokendef *tab, const char *str, size_t len, int *pres)
+{
+ for (; tab->name; tab++)
+ {
+ size_t kwlen = strlen (tab->name);
+ if (kwlen == len && c_strncasecmp (tab->name, str, len) == 0)
+ {
+ *pres = tab->tok;
+ return 0;
+ }
+ }
+ return 1;
+}
+
+int
+strtotok (struct tokendef *tab, const char *str, int *pres)
+{
+ return strtotok_len (tab, str, strlen (str), pres);
+}
+
+int
+strtotok_ci (struct tokendef *tab, const char *str, int *pres)
+{
+ return strtotok_len_ci (tab, str, strlen (str), pres);
+}
+
+int
+toktostr (struct tokendef *tab, int tok, const char **pres)
+{
+ for (; tab->name; tab++)
+ if (tab->tok == tok)
+ {
+ *pres = tab->name;
+ return 0;
+ }
+ return 1;
+}

Return to:

Send suggestions and report system problems to the System administrator.