From 90b200cac621ee925476297a2b70ddf3101cbb45 Mon Sep 17 00:00:00 2001
From: Rob Landley <rob@landley.net>
Date: Wed, 11 Jun 2014 22:13:28 -0500
Subject: Move toys.toycount initialization _after_ zeroing toys, so help -a
 works again.

---
 main.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'main.c')

diff --git a/main.c b/main.c
index f0969dfb..fdb47497 100644
--- a/main.c
+++ b/main.c
@@ -81,6 +81,7 @@ static void toy_singleinit(struct toy_list *which, char *argv[])
   toys.old_umask = umask(0);
   if (!(which->flags & TOYFLAG_UMASK)) umask(toys.old_umask);
   toys.signalfd--;
+  toys.toycount = ARRAY_LEN(toy_list);
 }
 
 // Setup toybox global state for this command.
@@ -167,8 +168,6 @@ int main(int argc, char *argv[])
 {
   if (CFG_TOYBOX_I18N) setlocale(LC_ALL, "");
 
-  toys.toycount = ARRAY_LEN(toy_list);
-
   if (CFG_TOYBOX) {
     // Trim path off of command name
     *argv = basename(*argv);
-- 
cgit v1.2.3