X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=main.c;h=60b369517dc82e718e421b86529b79592bec36f9;hb=6731ea31e05b733e558c3daeb6817e7b2737e803;hp=d9afcdbb11f625140d178585be23ac153540874d;hpb=7bba222018d77b1e04f8bb4bd28b53ffc4713b65;p=cparser

diff --git a/main.c b/main.c
index d9afcdb..60b3695 100644
--- a/main.c
+++ b/main.c
@@ -72,8 +72,9 @@
 #include "driver/firm_opt.h"
 #include "driver/firm_cmdline.h"
 #include "adt/error.h"
-#include "write_fluffy.h"
-#include "write_caml.h"
+#include "wrappergen/write_fluffy.h"
+#include "wrappergen/write_caml.h"
+#include "wrappergen/write_jna.h"
 #include "revision.h"
 #include "warning.h"
 #include "mangle.h"
@@ -180,30 +181,24 @@ static void initialize_firm(void)
 static void get_output_name(char *buf, size_t buflen, const char *inputname,
                             const char *newext)
 {
-	size_t last_dot = 0xffffffff;
-	size_t i = 0;
-
-	if (inputname == NULL) {
-		snprintf(buf, buflen, "a%s", newext);
-		return;
-	}
-
-	for (const char *c = inputname; *c != 0; ++c) {
-		if (*c == '.')
-			last_dot = i;
-		++i;
-	}
-	if (last_dot == 0xffffffff)
-		last_dot = i;
-
-	if (last_dot >= buflen)
-		panic("filename too long");
-	memcpy(buf, inputname, last_dot);
-
-	size_t extlen = strlen(newext) + 1;
-	if (extlen + last_dot >= buflen)
+	if (inputname == NULL)
+		inputname = "a";
+
+	char const *const last_slash = strrchr(inputname, '/');
+	char const *const filename   =
+		last_slash != NULL ? last_slash + 1 : inputname;
+	char const *const last_dot   = strrchr(filename, '.');
+	char const *const name_end   =
+		last_dot != NULL ? last_dot : strchr(filename, '\0');
+
+	int const len = snprintf(buf, buflen, "%.*s%s",
+			(int)(name_end - filename), filename, newext);
+#ifdef _WIN32
+	if (len < 0 || buflen <= (size_t)len)
+#else
+	if (buflen <= (size_t)len)
+#endif
 		panic("filename too long");
-	memcpy(buf+last_dot, newext, extlen);
 }
 
 #include "builtins.h"
@@ -508,7 +503,8 @@ typedef enum compile_mode_t {
 	LexTest,
 	PrintAst,
 	PrintFluffy,
-	PrintCaml
+	PrintCaml,
+	PrintJna
 } compile_mode_t;
 
 static void usage(const char *argv0)
@@ -829,6 +825,9 @@ int main(int argc, char **argv)
 				    strstart(orig_opt, "align-jumps=") ||
 				    strstart(orig_opt, "align-functions=")) {
 					fprintf(stderr, "ignoring gcc option '-f%s'\n", orig_opt);
+				} else if (strstart(orig_opt, "input-charset=")) {
+					char const* const encoding = strchr(orig_opt, '=') + 1;
+					select_input_encoding(encoding);
 				} else if (streq(orig_opt, "verbose-asm")) {
 					/* ignore: we always print verbose assembler */
 				} else {
@@ -839,19 +838,23 @@ int main(int argc, char **argv)
 						opt += 3;
 					}
 
-					if (streq(opt, "dollars-in-identifiers")) {
-						allow_dollar_in_symbol = truth_value;
-					} if (streq(opt, "builtins")) {
+					if (streq(opt, "builtins")) {
 						use_builtins = truth_value;
+					} else if (streq(opt, "dollars-in-identifiers")) {
+						allow_dollar_in_symbol = truth_value;
+					} else if (streq(opt, "omit-frame-pointer")) {
+						set_be_option(truth_value ? "omitfp" : "omitfp=no");
 					} else if (streq(opt, "short-wchar")) {
 						wchar_atomic_kind = truth_value ? ATOMIC_TYPE_USHORT
 							: ATOMIC_TYPE_INT;
-					} else if (streq(opt, "syntax-only")) {
-						mode = truth_value ? ParseOnly : CompileAssembleLink;
-					} else if (streq(opt, "omit-frame-pointer")) {
-						set_be_option(truth_value ? "omitfp" : "omitfp=no");
+					} else if (streq(opt, "signed-char")) {
+						char_is_signed = truth_value;
 					} else if (streq(opt, "strength-reduce")) {
 						firm_option(truth_value ? "strength-red" : "no-strength-red");
+					} else if (streq(opt, "syntax-only")) {
+						mode = truth_value ? ParseOnly : CompileAssembleLink;
+					} else if (streq(opt, "unsigned-char")) {
+						char_is_signed = !truth_value;
 					} else if (streq(opt, "fast-math")               ||
 					           streq(opt, "jump-tables")             ||
 					           streq(opt, "unroll-loops")            ||
@@ -1018,10 +1021,6 @@ int main(int argc, char **argv)
 				} else if (streq(option, "no-ms")) {
 					features_on  &= ~_MS;
 					features_off |=  _MS;
-				} else if (streq(option, "signed-chars")) {
-					char_is_signed = true;
-				} else if (streq(option, "unsigned-chars")) {
-					char_is_signed = false;
 				} else if (streq(option, "strict")) {
 					strict_mode = true;
 				} else if (streq(option, "lextest")) {
@@ -1038,6 +1037,8 @@ int main(int argc, char **argv)
 					mode = PrintFluffy;
 				} else if (streq(option, "print-caml")) {
 					mode = PrintCaml;
+				} else if (streq(option, "print-jna")) {
+					mode = PrintJna;
 				} else if (streq(option, "version")) {
 					print_cparser_version();
 					exit(EXIT_SUCCESS);
@@ -1157,6 +1158,7 @@ int main(int argc, char **argv)
 		case PrintAst:
 		case PrintFluffy:
 		case PrintCaml:
+		case PrintJna:
 		case LexTest:
 		case PreprocessOnly:
 		case ParseOnly:
@@ -1348,6 +1350,9 @@ do_parsing:
 			} else if (mode == PrintCaml) {
 				write_caml_decls(out, unit);
 				continue;
+			} else if (mode == PrintJna) {
+				write_jna_decls(out, unit);
+				continue;
 			}
 
 			translation_unit_to_firm(unit);