Renaming ffsconvert to kext2ffs

OZMTool/README

@@ -11,7 +11,7 @@ It includes the following useful tools to help you in this process:
         --ozmupdate		Updates clean BIOS with files from old OZM-flavoured one
         --ozmextract		Extracts Ozmosis files (ffs) from BIOS
         --ozmcreate		Patches Original BIOS with Ozmosis
-        --ffsconvert		Converts kext-directories to FFS
+        --kext2ffs		Converts kext-directories to FFS
         --dsdt2bios		Injects (bigger) DSDT into AmiBoardInfo
 	--help, -h		Print usage (append command to print cmd-usage!)
 
@@ -42,7 +42,7 @@ It includes the following useful tools to help you in this process:
 
     If all attempts fail, the output image wont be created (obviously)
 
-* FFSConvert
+* Kext2Ffs
     Converts files to FFS. It accepts *.kext and OzmosisDefaults.plist.
     Uses UEFITool's technique to create the FFS :)
 
@@ -67,7 +67,7 @@ USAGE
 ./OZMTool --ozmupdate --aggressivity 1 --compressdxe --out RECENT_OZM_BIOS.ROM --input OLD_OZM.ROM --recent NEW_CLEAN_BIOS.ROM
 ./OZMTool --ozmextract --out outputdir --input OZM.ROM
 ./OZMTool --ozmcreate --aggressivity 1 --compressdxe --kext kextdir --ffs ffsdir --dsdt DSDT.aml --out outputfile --input BIOS.ROM
-./OZMTool --ffsconvert --out outputdir --input kextsdir
+./OZMTool --kext2ffs --out outputdir --input kextsdir
 ./OZMTool --dsdt2bios --input AmiBoardInfo.bin --dsdt DSDT.aml --out patchedAmiBoardInfo.bin
 
 

OZMTool/ozmtool.cpp

@@ -649,7 +649,7 @@ UINT8 OZMTool::OZMCreate(QString inputfile, QString outputfile, QString inputFFS
     return ERR_SUCCESS;
 }
 
-UINT8 OZMTool::FFSConvert(QString inputdir, QString outputdir)
+UINT8 OZMTool::Kext2Ffs(QString inputdir, QString outputdir)
 {
     int i;
     UINT8 ret;

OZMTool/ozmtool.h

@@ -29,7 +29,7 @@ class OZMTool : public QObject
     UINT8 OZMUpdate(QString inputfile, QString recentBios, QString outputfile, int aggressivity, bool compressdxe);
     UINT8 OZMExtract(QString inputfile, QString outputdir);
     UINT8 OZMCreate(QString inputfile, QString outputfile, QString inputFFSdir, QString inputKextdir, QString inputEFIdir, QString inputDSDTfile, int aggressivity, bool compressdxe, bool compresskexts);
-    UINT8 FFSConvert(QString inputdir, QString outputdir);
+    UINT8 Kext2Ffs(QString inputdir, QString outputdir);
     UINT8 DSDT2Bios(QString inputfile, QString inputDSDTfile, QString outputfile);
 private:
 };

OZMTool/ozmtool_main.cpp

@@ -34,11 +34,11 @@ void usageDsdt2Bios()
             "\t-h, --help\t\tPrint this\n\n",qPrintable(appname));
 }
 
-void usageFfsConvert()
+void usageKext2Ffs()
 {
-    printf("ffsconvert command\n"
+    printf("kext2ffs command\n"
             " usage:\n"
-            "\t%s --ffsconvert -o outputdir -i kextsdir\n\n"
+            "\t%s --kext2ffs -o outputdir -i kextsdir\n\n"
             " parameters:\n"
             "\t-i, --input [dir]\t\tInput kexts directory\n"
             "\t-o, --out [dir]\t\tOutput ffs directory\n"
@@ -121,7 +121,7 @@ void usageGeneral()
             "\t--ozmupdate\t\tUpdates clean BIOS with files from old OZM-flavoured one\n"
             "\t--ozmextract\t\tExtracts Ozmosis files (ffs) from BIOS\n"
             "\t--ozmcreate\t\tPatches Original BIOS with Ozmosis\n"
-            "\t--ffsconvert\t\tConverts kext-directories to FFS\n"
+            "\t--kext2ffs\t\tConverts kext-directories to FFS\n"
             "\t--dsdt2bios\t\tInjects (bigger) DSDT into AmiBoardInfo\n"
             "\t--help, -h\t\tPrint this\n\n",qPrintable(appname));
 }
@@ -139,7 +139,7 @@ void usageAll()
     usageOzmUpdate();
     usageOzmExtract();
     usageOzmCreate();
-    usageFfsConvert();
+    usageKext2Ffs();
     usageDsdt2Bios();
 }
 
@@ -151,7 +151,7 @@ int main(int argc, char *argv[])
     bool ozmupdate = false;
     bool ozmextract = false;
     bool ozmcreate = false;
-    bool ffsconvert = false;
+    bool kext2ffs = false;
     bool dsdt2bios = false;
     bool compressdxe = false;
     bool compresskexts = false;
@@ -234,8 +234,8 @@ int main(int argc, char *argv[])
             continue;
         }
 
-        if (strcasecmp(argv[0], "--ffsconvert") == 0) {
-            ffsconvert = true;
+        if (strcasecmp(argv[0], "--kext2ffs") == 0) {
+            kext2ffs = true;
             argc --;
             argv ++;
             continue;
@@ -372,7 +372,7 @@ int main(int argc, char *argv[])
         return ERR_GENERIC_CALL_NOT_SUPPORTED;
     }
 
-    int cmds = dsdtextract + dsdtinject + ozmextract + ozmupdate + ozmcreate + ffsconvert + dsdt2bios;
+    int cmds = dsdtextract + dsdtinject + ozmextract + ozmupdate + ozmcreate + kext2ffs + dsdt2bios;
 
     versionInfo();
 
@@ -389,8 +389,8 @@ int main(int argc, char *argv[])
             usageOzmExtract();
         else if (ozmcreate)
             usageOzmCreate();
-        else if (ffsconvert)
-            usageFfsConvert();
+        else if (kext2ffs)
+            usageKext2Ffs();
         else if (dsdt2bios)
             usageDsdt2Bios();
         else
@@ -445,8 +445,8 @@ int main(int argc, char *argv[])
         result = w.OZMExtract(inputpath, output);
     else if (ozmcreate)
         result = w.OZMCreate(inputpath, output, ffsdir, kextdir, efidir, dsdtfile, aggressivity, compressdxe, compresskexts);
-    else if (ffsconvert)
-        result = w.FFSConvert(inputpath, output);
+    else if (kext2ffs)
+        result = w.Kext2Ffs(inputpath, output);
     else if (dsdt2bios)
         result = w.DSDT2Bios(inputpath, dsdtfile, output);