Merge branch 'feature/upstream' into develop

1 files changed, 40 insertions, 13 deletions

diff --git a/src/utils/xb_undelall.cpp b/src/utils/xb_undelall.cpp
index 4f1af12..5fb1323 100755
--- a/src/utils/xb_undelall.cpp
+++ b/src/utils/xb_undelall.cpp
@@ -1,8 +1,8 @@
-/*  xb_deletall.cpp
+/*  xb_undelall.cpp
 
 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.
@@ -13,8 +13,7 @@ Email Contact:
     xb64-users@lists.sourceforge.net
 
 
-
-This program sets the delete flag on all records in a dbf file
+This program removes the delete flag on all records flagged for deletion in a DBF file
 
 */
 
@@ -24,32 +23,60 @@ This program sets the delete flag on all records in a dbf file
 
 using namespace xb;
 
-int main(int ac,char** av)
+
+
+void PrintHelp();
+void PrintHelp(){
+  std::cout << "Usage: xb_undelall [-h] [-?] [--help] [-v] [--version] -i myfile"  << std::endl << std::endl;
+  std::cout << "This program removes the deletion flags all the records in a DBF table that are flagged for deletion.";
+  std::cout << 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;
   xbDbf *MyFile = NULL;
   xbInt16 iRc = 0;
 
-  if (ac <= 1) {
-    std::cout << "\nUsage: xb_deletall filename...\n";
+  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(( iRc = x.OpenHighestVersion( av[1], "", &MyFile )) != XB_NO_ERROR ){
-    std::cout << "Could not open file iRc = " << iRc  << " file = "  << av[1] << std::endl;
+  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 RC = " << iRc  << " file = "  << sParm.Str() << std::endl;
     x.DisplayError( iRc );
-    return 0;
+    return 1;
   }
 
   iRc = MyFile->UndeleteAllRecords(); 
   if( iRc != XB_NO_ERROR ) {
-    std::cout << "Error Undeleting all records - database ==> "  << av[1]  << "\n";
+    std::cout << "Error Undeleting all records - database ==> "  << sParm.Str()  << "\n";
     std::cout << " Return Code = " << iRc;
+    return 1;
   }
   MyFile->Close();
   delete MyFile;
-  std::cout << "\nDone...\n\n";
-  
   return 0;
 }
\ No newline at end of file