--- a/src/common/unacpp.cpp
+++ b/src/common/unacpp.cpp
@@ -28,14 +28,27 @@
#include "utf8iter.h"
bool unacmaybefold(const string &in, string &out,
- const char *encoding, bool dofold)
+ const char *encoding, UnacOp what)
{
char *cout = 0;
size_t out_len;
- int status;
- status = dofold ?
- unacfold_string(encoding, in.c_str(), in.length(), &cout, &out_len) :
- unac_string(encoding, in.c_str(), in.length(), &cout, &out_len);
+ int status = -1;
+
+ switch (what) {
+ case UNACOP_UNAC:
+ status = unac_string(encoding, in.c_str(), in.length(),
+ &cout, &out_len);
+ break;
+ case UNACOP_UNACFOLD:
+ status = unacfold_string(encoding, in.c_str(), in.length(),
+ &cout, &out_len);
+ break;
+ case UNACOP_FOLD:
+ status = fold_string(encoding, in.c_str(), in.length(),
+ &cout, &out_len);
+ break;
+ }
+
if (status < 0) {
if (cout)
free(cout);
@@ -59,11 +72,11 @@
it.appendchartostring(shorter);
string noacterm, noaclowterm;
- if (!unacmaybefold(shorter, noacterm, "UTF-8", false)) {
+ if (!unacmaybefold(shorter, noacterm, "UTF-8", UNACOP_UNAC)) {
LOGINFO(("unaciscapital: unac failed for [%s]\n", in.c_str()));
return false;
}
- if (!unacmaybefold(noacterm, noaclowterm, "UTF-8", true)) {
+ if (!unacmaybefold(noacterm, noaclowterm, "UTF-8", UNACOP_UNACFOLD)) {
LOGINFO(("unaciscapital: unacfold failed for [%s]\n", in.c_str()));
return false;
}
@@ -90,31 +103,76 @@
#include "readfile.h"
#include "rclinit.h"
+static char *thisprog;
+
+static char usage [] = "\n"
+ "[-c|-C] <encoding> <infile> <outfile>\n"
+ " Default : unaccent\n"
+ " -c : unaccent and casefold\n"
+ " -C : casefold only\n"
+ "\n";
+
+;
+static void
+Usage(void)
+{
+ fprintf(stderr, "%s: usage: %s\n", thisprog, usage);
+ exit(1);
+}
+
+static int op_flags;
+#define OPT_c 0x2
+#define OPT_C 0x4
+
int main(int argc, char **argv)
{
- bool dofold = true;
- if (argc != 4) {
- cerr << "Usage: unacpp <encoding> <infile> <outfile>" << endl;
- exit(1);
+ UnacOp op = UNACOP_UNAC;
+
+ thisprog = argv[0];
+ argc--; argv++;
+
+ while (argc > 0 && **argv == '-') {
+ (*argv)++;
+ if (!(**argv))
+ /* Cas du "adb - core" */
+ Usage();
+ while (**argv)
+ switch (*(*argv)++) {
+ case 'c': op_flags |= OPT_c; break;
+ case 'C': op_flags |= OPT_C; break;
+ default: Usage(); break;
+ }
+ argc--; argv++;
}
- const char *encoding = argv[1];
- string ifn = argv[2];
+
+ if (op_flags & OPT_c) {
+ op = UNACOP_UNACFOLD;
+ } else if (op_flags & OPT_C) {
+ op = UNACOP_FOLD;
+ }
+
+ if (argc != 3) {
+ Usage();
+ }
+
+ const char *encoding = *argv++; argc--;
+ string ifn = *argv++; argc--;
if (!ifn.compare("stdin"))
ifn.clear();
- const char *ofn = argv[3];
+ const char *ofn = *argv++; argc--;
string reason;
(void)recollinit(RCLINIT_NONE, 0, 0, reason, 0);
string odata;
if (!file_to_string(ifn, odata)) {
- cerr << "file_to_string: " << odata << endl;
- exit(1);
+ cerr << "file_to_string " << ifn << " : " << odata << endl;
+ return 1;
}
string ndata;
- if (!unacmaybefold(odata, ndata, encoding, dofold)) {
+ if (!unacmaybefold(odata, ndata, encoding, op)) {
cerr << "unac: " << ndata << endl;
- exit(1);
+ return 1;
}
int fd;
@@ -126,14 +184,14 @@
if (fd < 0) {
cerr << "Open/Create " << ofn << " failed: " << strerror(errno)
<< endl;
- exit(1);
+ return 1;
}
if (write(fd, ndata.c_str(), ndata.length()) != (int)ndata.length()) {
cerr << "Write(2) failed: " << strerror(errno) << endl;
- exit(1);
+ return 1;
}
close(fd);
- exit(0);
+ return 0;
}
#endif