Sat May 20 09:46:17 2017 UTC ()

always put the module on the stack


(mbalmer)

diff -r1.22 -r1.23 src/sys/modules/lua/lua.c

--- src/sys/modules/lua/lua.c 2017/05/20 08:31:13	1.22
+++ src/sys/modules/lua/lua.c 2017/05/20 09:46:17	1.23

 @@ -1,14 +1,14 @@
-/*	$NetBSD: lua.c,v 1.22 2017/05/20 08:31:13 mbalmer Exp $ */
+/*	$NetBSD: lua.c,v 1.23 2017/05/20 09:46:17 mbalmer Exp $ */
 /*
  * Copyright (c) 2011 - 2017 by Marc Balmer <mbalmer@NetBSD.org>.
  * Copyright (c) 2014 by Lourival Vieira Neto <lneto@NetBSD.org>.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -504,36 +504,36 @@ lua_require(lua_State *L)
 		if (lua_verbose)
 			device_printf(sc_self, "autoload %s\n", name);
 		module_autoload(name, MODULE_CLASS_MISC);
 		LIST_FOREACH(m, &lua_modules, mod_next)
 			if (!strcmp(m->mod_name, module)) {
 				md = m;
 				break;
+			}
+	}
 	if (md != NULL)
 		LIST_FOREACH(s, &lua_states, lua_next)
 			if (s->K->L == L) {
 				LIST_FOREACH(m, &s->lua_modules, mod_next)
 					if (m == md)
 						return 1;
 				if (lua_verbose)
 					device_printf(sc_self,
 					    "require module %s\n",
 					    md->mod_name);
 				luaL_requiref(L, md->mod_name, md->open, 0);
 				LIST_FOREACH(m, &s->lua_modules, mod_next)
 					if (m == md)
 						return 1;
 				md->refcount++;
 				LIST_INSERT_HEAD(&s->lua_modules, md, mod_next);
 				return 1;
+			}
 	lua_pushstring(L, "module not found");
 	return lua_error(L);
+}
 typedef struct {
 	size_t size;
 } __packed alloc_header_t;