[Initng-svn] r3851 - initng/trunk/tools

[svn at initng.thinktux.net]

Author: jimmy
Date: Thu Apr 20 01:37:23 2006
New Revision: 3851

Modified:
   initng/trunk/tools/itype.c

Log:
More itype work.


Modified: initng/trunk/tools/itype.c
==============================================================================
--- initng/trunk/tools/itype.c	(original)
+++ initng/trunk/tools/itype.c	Thu Apr 20 01:37:23 2006
@@ -83,7 +83,7 @@
 
 int main(int argc, char *argv[], char *env[])
 {
-	/*printf("argc: %i argv[0]: %s argv[1]: %s argv[2]: %s\n", argc, argv[0], argv[1], argv[2]); */
+	printf("argc: %i argv[0]: %s argv[1]: %s argv[2]: %s\n", argc, argv[0], argv[1], argv[2]); 
 
 	/* initialise global variables */
 	initng_global_new(argc, argv, env, I_AM_UTILITY);
@@ -95,20 +95,6 @@
 		exit(1);
 	}
 
-	/* se what we want do be done */
-	if (argc == 3 && strcmp(argv[1], "--list_services") == 0)
-	{
-		service_cache_h *service = NULL;
-
-		parse_path(argv[2]);
-		while_service_cache(service)
-		{
-			printf("%s ", service->name);
-		}
-		printf("\n");
-		goto end;
-	}
-
 	/* fallback */
 	if (argc == 3)
 	{
@@ -134,24 +120,22 @@
 				printf("ngc -s %s\n", serv->name);
 				goto end;
 			}
+			
+			if (strcmp(argv[2], "list") == 0)
+			{
+				serv=NULL; /* walk them all */
+				while_service_cache(serv)
+				{
+					printf("%s ", serv->name);
+				}
+				printf("\n");
+				goto end;
+			}
 		}
 	}
 
-	if (argc == 1 && argv[1])
-	{
-		service_cache_h *service = NULL;
-
-		printf("%s file content these services:\n", argv[1]);
-		parse_path(argv[1]);
-		while_service_cache(service)
-		{
-			printf(" * %s\n", service->name);
-		}
-		goto end;
-	}
-
 	{
-		printf("Usage: itype --list_services i_file.i\n");
+		printf("Usage: itype i_file.i [start] [stop] [status] [list]\n");
 	}
   end:
 	/* unload all modules */