From 1f4877b4a34cdf07fedb10156785e30b43355d00 Mon Sep 17 00:00:00 2001
From: Jeffrey Townsend <jeffrey.townsend@bigswitch.com>
Date: Mon, 19 Sep 2016 16:20:35 +0000
Subject: [PATCH] Option to enter debug handler directly.

---
 .../any/onlp/src/onlp/module/src/onlp_main.c   | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/packages/base/any/onlp/src/onlp/module/src/onlp_main.c b/packages/base/any/onlp/src/onlp/module/src/onlp_main.c
index 5afbb143..51cbb36d 100644
--- a/packages/base/any/onlp/src/onlp/module/src/onlp_main.c
+++ b/packages/base/any/onlp/src/onlp/module/src/onlp_main.c
@@ -31,6 +31,7 @@
 #include <sff/sff_db.h>
 #include <AIM/aim_log_handler.h>
 #include <syslog.h>
+#include <onlp/platformi/sysi.h>
 
 static void platform_manager_daemon__(const char* pidfile, char** argv);
 
@@ -52,8 +53,8 @@ show_inventory__(aim_pvs_t* pvs, int database)
     }
     else {
         if(!database) {
-        aim_printf(pvs, "Port  Type            Media   Status  Len    Vendor            Model             S/N             \n");
-        aim_printf(pvs, "----  --------------  ------  ------  -----  ----------------  ----------------  ----------------\n");
+            aim_printf(pvs, "Port  Type            Media   Status  Len    Vendor            Model             S/N             \n");
+            aim_printf(pvs, "----  --------------  ------  ------  -----  ----------------  ----------------  ----------------\n");
         }
 
         AIM_BITMAP_ITER(&bitmap, port) {
@@ -64,7 +65,7 @@ show_inventory__(aim_pvs_t* pvs, int database)
 
             if(rv == 0) {
                 if(!database) {
-                aim_printf(pvs, "%4d  NONE\n", port);
+                    aim_printf(pvs, "%4d  NONE\n", port);
                 }
                 continue;
             }
@@ -187,9 +188,14 @@ onlpdump_main(int argc, char* argv[])
     /**
      * debug trap
      */
-    if(argc > 1 && !strcmp(argv[1], "debug")) {
-        onlp_init();
-        return onlp_sys_debug(&aim_pvs_stdout, argc-2, argv+2);
+    if(argc > 1 && (!strcmp(argv[1], "debug") || !strcmp(argv[1], "debugi"))) {
+        if(!strcmp(argv[1], "debug")) {
+            onlp_init();
+            return onlp_sys_debug(&aim_pvs_stdout, argc-2, argv+2);
+        }
+        else {
+            return onlp_sysi_debug(&aim_pvs_stdout, argc-2, argv+2);
+        }
     }
 
     while( (c = getopt(argc, argv, "srehdojmyM:ipxlSt:O:b")) != -1) {