Use turn_back_am() to implement peephole_ia32_Imul_split().

[libfirm] / ir / libcore / lc_opts.c

diff --git a/ir/libcore/lc_opts.c b/ir/libcore/lc_opts.c
index ff472c6..8d0868d 100644 (file)
--- a/ir/libcore/lc_opts.c
+++ b/ir/libcore/lc_opts.c
@@ -726,7 +726,7 @@ int lc_opt_from_single_arg(const lc_opt_entry_t *root,
        int ret                   = 0;
 
        lc_opt_err_info_t err;
-       char *end, *buf;
+       char *end, *buf, *eqsign;
 
        if(n >= n_prefix && strncmp(opt_prefix, arg, n_prefix) == 0) {
                arg = arg + n_prefix;
@@ -756,7 +756,10 @@ int lc_opt_from_single_arg(const lc_opt_entry_t *root,
 
                /* find the next delimiter (the -) and extract the string up to
                 * there. */
-               end = strchr(arg, OPT_DELIM);
+               end    = strchr(arg, OPT_DELIM);
+               eqsign = strchr(arg, '=');
+               if (eqsign && eqsign < end)
+                       end = NULL;
                while(end != NULL) {
                        /*
                         * Copy the part of the option into the buffer and add the
@@ -772,7 +775,10 @@ int lc_opt_from_single_arg(const lc_opt_entry_t *root,
 
                        /* Find the next option part delimiter. */
                        arg = end + 1;
-                       end = strchr(arg, OPT_DELIM);
+                       end    = strchr(arg, OPT_DELIM);
+                       eqsign = strchr(arg, '=');
+                       if (eqsign && eqsign < end)
+                               end = NULL;
                        obstack_free(&obst, buf);
                }
 
@@ -911,11 +917,19 @@ void lc_opts_init(const char *ini_name, lc_opt_entry_t *root, const char *arg_pr
        strncpy(home_dir_ini_file, local_ini_file, sizeof(home_dir_ini_file));
        home_dir_ini_file[sizeof(home_dir_ini_file) - 1] = '\0';
 #else
-       strcpy(path, getpwuid(getuid())->pw_dir);
-       strncat(path, "/", sizeof(path));
-       /* .<cmnt>rc */
-       snprintf(home_dir_ini_file, sizeof(home_dir_ini_file), ".%src", ini_name);
-       home_dir_ini_file[sizeof(home_dir_ini_file) - 1] = '\0';
+       {
+               struct passwd *entry = getpwuid(getuid());
+               if (entry != NULL) {
+                       strcpy(path, entry->pw_dir);
+                       strncat(path, "/", sizeof(path));
+                       /* .<cmnt>rc */
+                       snprintf(home_dir_ini_file, sizeof(home_dir_ini_file), ".%src", ini_name);
+                       home_dir_ini_file[sizeof(home_dir_ini_file) - 1] = '\0';
+               } else {
+                       /* FIXME: some error occured */
+                       home_dir_ini_file[0] = '\0';
+               }
+       }
 #endif
 
        strncat(path, home_dir_ini_file, sizeof(path));