Changeset 168

Timestamp:

06/24/05 07:21:18 (4 years ago)

Author:

sshimko

Message:

-Added and modified semantic checks applied to command line arguments

Files:

• trunk/src/com/tresys/framework/Compiler.java (modified) (9 diffs)

trunk/src/com/tresys/framework/Compiler.java

@@ -38 +38 @@
-        static String dictOutputFilename = null;
-        static String polFilename = null;
-
+
+
+
+
-        static String pcFilename = null;
-        static String fcFilename = null;
@@ -108 +111 @@
-                                        System.exit(1);
-                                }                               
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                                } else {
-                                        printUsage();
@@ -149 +176 @@
-                }
-                
+                // system resources requires file context
+                if (sysFilename != null && fcFilename == null){
+                        System.err.println("Error: the -fc flag is required when using the -s flag.");
+                        getOptError = true;
+                }
+                
+                // requires file_context file to generate .fc
+                if (fcOutputFilename != null && fcFilename == null){
+                        System.err.println("Error: the -fc flag is required when using the -sf flag.");
+                        getOptError = true;
+                }
+                
-                // certain flags require a framework policy file
-                if (polFilename == null && 
-fcFilename != null || o
-fc and -o
+sysFilename != null || polOutp
+po and -s
-                                        + "policy to be provided by using the -p argument.");
-                        getOptError = true;
@@ -162 +201 @@
-                }
-        }
+
-        /**
-         * Display dictionary parser usage.
@@ -167 +207 @@
-        private static void printUsage (){
-                System.out.println("SEFramework compiler usage:\n");
-
-
-
+
+
+
+
+
+
+
-                System.out.println("\nGeneral arguments:");
-                System.out.println("  -h display this message and exit");
@@ -176 +220 @@
-                System.out.println("\nGlobal arguments:");
-                System.out.println("  -pc <policy.conf> specify base policy policy.conf");
+                System.out.println("  -fc <file_context> specify base policy file_context");
-                System.out.println("\nDictionary arguments:");
+                System.out.println("  -dc <compiled dictionary> specify pre-compiled dictionary file created using the -do flag");
-                System.out.println("  -ds <dictionary source> specify source file for dictionary");
-                System.out.println("  -do <dictionary output> specify destination file for dictionary storage");
-
-
-
-
-
+
+
+
+
+
+
+
-                System.out.println("\nA single dictionary file must be specified (either source, or compiled)");
-        }
@@ -204 +252 @@
-                com.tresys.framework.dictionary.Config.SetDebug(debug);
-                com.tresys.framework.policy.Config.SetDebug(debug);
+                com.tresys.framework.systemResources.Config.SetDebug(debug);
-                com.tresys.framework.dictionary.Config.SetWarn(warn);
-                com.tresys.framework.policy.Config.SetWarn(warn);
+                com.tresys.framework.systemResources.Config.SetWarn(warn);
-
-                // create linkage interface depending on compilation targets
-                try  {
-pol
+fc
-                                linkage = new Linkage(pcFilename, fcFilename);
-                        } else { 
@@ -246 +296 @@
-                        
-                        // policy can only be translated in context of a file_context and policy.conf
- || pcFilename == null
-Error
-translation and linkage to occur!
+
+Warning
+proper translation and linkage to occur!  Will attempt to continue anyways...
-                                System.exit(1);
-                        }
@@ -267 +317 @@
-                        }
-
-o
+polOutp
-                                try {
-o
-o
+polOutp
+polOutp
-                                } catch (FileNotFoundException e){
-o
+polOutp
-                                        System.exit(1);
-                                }