update to upstream 20150115

Change-Id: I8943d5a8c98049843e6753c38beac89927690d72

1 files changed, 44 insertions, 12 deletions

diff --git a/initvm.c b/initvm.c
index d7fb405..241cf41 100644
--- a/initvm.c
+++ b/initvm.c
@@ -19,7 +19,22 @@
  *		build script to execute once binfmts are set up
  *
  * AUTHOR
- *	James Perkins <james.perkins@linuxfoundation.org>
+ *      Copyright (c) 2012 James Perkins <james.perkins@linuxfoundation.org>
+ * 	i                  Adrian Schroeter <adrian@suse.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 or 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program 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 this program (see the file COPYING); if not, write to the
+ * Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
 #include <sys/mount.h>
@@ -177,7 +192,7 @@ enum okfail binfmt_register(char *datafile, char *regfile)
 
 		if (buf[0] != ':')	/* non-data input line */
 		{
-			goto skip;
+			continue;
 		}
 
 		/* copy buf and tokenize :-seperated fields into f[] */
@@ -200,21 +215,41 @@ enum okfail binfmt_register(char *datafile, char *regfile)
 		{
 			fprintf(stderr, "%s: line %d: extra fields, ignoring."
 				" Content: %s", datafile, line, buf);
-			goto skip;
+			continue;
 		}
 
 		if (n < n_fields)
 		{
 			fprintf(stderr, "%s: line %d: missing fields, ignoring."
 				" Content: %s", datafile, line, buf);
-			goto skip;
+			continue;
 		}
 
+		int ret;
+                /* Is an interpreter for this arch already registered? */
+		snprintf(path, sizeof(path), SYSFS_BINFMT_MISC "/%s", f[name]);
+		ret=access(path, X_OK);
+			fprintf(stderr, 
+				"interpreter for '%s' is %d\n",
+				f[name], ret);
+		if (ret == 0) {
+#ifdef DEBUG
+			fprintf(stderr, 
+				"interpreter for '%s' already registered, ignoring\n",
+				f[name]);
+#endif /* DEBUG */
+			continue;
+		}
 
-		if (access(f[interpreter], X_OK) != 0) {
-			fprintf(stderr,
-				"warning: %s: line %d: interpreter '%s' not "
-				"found\n", datafile, line, f[interpreter]);
+                /* Does the interpreter exists? */
+		ret=access(f[interpreter], X_OK);
+		if (ret != 0) {
+#ifdef DEBUG
+			fprintf(stderr, 
+				"%s: line %d: interpreter '%s' not found,"
+				" ignoring, return %d\n", datafile, line, f[interpreter], ret);
+#endif /* DEBUG */
+			continue;
 		}
 
 		if (!write_file_string(regfile, buf)) {
@@ -237,9 +272,6 @@ enum okfail binfmt_register(char *datafile, char *regfile)
 
 		DBG(fprintf(stderr, "dumping: %s\n", path));
 		DBG(dump_file(path));
-
-skip:
-		;
 	}
 
 
@@ -326,7 +358,7 @@ int main(int argc, char* argv[], char* env[])
 			exit(1);
 		}
 		execve(BUILD, args, env);
-		perror("execve");
+		perror("execve of "BUILD);
 		exit(1);
 	}