1 files changed, 40 insertions, 14 deletions

diff --git a/src/utils/xb_pack.cpp b/src/utils/xb_pack.cpp
index ccec5a3..0cbba7e 100755
--- a/src/utils/xb_pack.cpp
+++ b/src/utils/xb_pack.cpp
@@ -2,7 +2,7 @@
 
 XBase64 Software Library
 
-Copyright (c) 1997,2003,2014,2017 Gary A Kunkel
+Copyright (c) 1997,2003,2014,2017,2023 Gary A Kunkel
 
 The xb64 software library is covered under 
 the terms of the GPL Version 3, 2007 license.
@@ -17,33 +17,59 @@ Email Contact:
 #include <xbase.h>
 using namespace xb;
 
-int main(int ac,char** av)
-{
-  if (ac <= 1) {
-    std::cout <<
-    "\nUsage: xb_pack filename...\n"
-    "\nThis program does automatically reindexes any open NDX or MDX indexes.";
-    return 1;
-  }
+void PrintHelp();
+void PrintHelp(){
+  std::cout << "Usage: xb_pack [-h] [-?] [--help] [-v] [--version] -i filename.DBF"  << std::endl << std::endl;
+  std::cout << "This program removes data records that are flagged for deletion in a DBF file and rebuilds indices." << std::endl << std::endl;
+}
+void PrintVersion();
+void PrintVersion(){
+  std::cout << "Xbase64 Version: " << xbase_VERSION_MAJOR << "." << xbase_VERSION_MINOR << "." << xbase_VERSION_PATCH << std::endl;
+}
 
+int main(int argc, char *argv[] )
+{
   xbXBase x;
   xbInt16 iRc;
   xbDbf * MyFile = NULL;
-  if(( iRc = x.OpenHighestVersion( av[1], "", &MyFile )) != XB_NO_ERROR ){
-    std::cout << "Could not open file iRc = " << iRc  << " file = "  << av[1] << std::endl;
+
+  xbString sParm;
+  if (argc < 2 || x.GetCmdLineOpt( argc, argv, "-h", sParm ) ||
+                  x.GetCmdLineOpt( argc, argv, "-?", sParm ) ||
+                  x.GetCmdLineOpt( argc, argv, "--help", sParm )){
+    PrintHelp();
+    return 1;
+  }
+
+  if ( x.GetCmdLineOpt( argc, argv, "-v", sParm ) ||
+       x.GetCmdLineOpt( argc, argv, "--version", sParm )){
+    PrintVersion();
+    return 1;
+  }
+
+  if( !x.GetCmdLineOpt( argc, argv, "-i", sParm ) || sParm == "" ){
+    PrintHelp();
+    return 1;
+  }
+
+  if(( iRc = x.OpenHighestVersion( sParm.Str(), "", &MyFile )) != XB_NO_ERROR ){
+    std::cout << "Could not open file iRc = " << iRc  << " file = "  << sParm.Str() << std::endl;
     x.DisplayError( iRc );
-    return 0;
+    return 1;
   }
 
   if(( iRc  = MyFile->Pack()) != XB_NO_ERROR ) {
-    std::cout << "\nError packing DBF database ==> " << av[1] << std::endl;
+    std::cout << "\nError packing DBF database ==> " << sParm.Str() << std::endl;
     std::cout << " Return Code = " << iRc << std::endl;
+    return 1;
   }
 
   #ifdef XB_INDEX_SUPPORT
   if(( iRc  = MyFile->Reindex( 1 )) != XB_NO_ERROR ) {
-    std::cout << "\nError reindexing DBF database ==> " << av[1] << std::endl;
+    std::cout << "\nError reindexing DBF database ==> " << sParm.Str() << std::endl;
     std::cout << " Return Code = " << iRc << std::endl;
+    x.DisplayError( iRc );
+    return 1;
   }
   #endif  // XB_INDEX_SUPPORT