New upstream version 4.1.0upstream/4.1.0

1 files changed, 58 insertions, 20 deletions

diff --git a/src/utils/xb_copydbf.cpp b/src/utils/xb_copydbf.cpp
index 1f88eb9..2466b1b 100755
--- a/src/utils/xb_copydbf.cpp
+++ b/src/utils/xb_copydbf.cpp
@@ -2,7 +2,7 @@
 
 XBase64 Software Library
 
-Copyright (c) 1997,2003,2014,2019 Gary A Kunkel
+Copyright (c) 1997,2003,2014,2019,2023 Gary A Kunkel
 
 The xb64 software library is covered under 
 the terms of the GPL Version 3, 2007 license.
@@ -17,42 +17,80 @@ Email Contact:
 #include <xbase.h>
 using namespace xb;
 
-int main(int ac,char** av)
+
+void PrintHelp();
+void PrintHelp(){
+  std::cout << "Usage: xb_copydbf [-h] [-?] [--help] [-v] [--version] -s source.DBF -t target.DBF"  << std::endl << std::endl;
+  std::cout << "This program copies the structure of a table defined in source.DBF to target.DBF.  Data and indices are not included.";
+  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[])
 {
-  if (3 != ac) {
-    std::cout <<
-    "\nUsage: xb_copydbf filename1 filename2\n"
-    "This program copies the structure of one dbf file to another\n";
+
+  xbXBase x;
+  xbInt16 iRc;
+  xbDbf *dSrc = NULL;
+  xbDbf *dTrg = NULL;
+
+  xbString sParm;
+  xbString sSrcDbf;
+  xbString sTrgDbf;
+
+  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;
   }
 
-  char* sFileName = av[1];
-  char* tFileName = av[2];
+  if( !x.GetCmdLineOpt( argc, argv, "-s", sSrcDbf ) || sSrcDbf == "" ){
+    PrintHelp();
+    return 1;
+  }
 
-  xbXBase x;
-  xbInt16 iRc;
-  xbDbf *MyFile = NULL;
-  xbDbf *MyNewFile = NULL;
+  if( !x.GetCmdLineOpt( argc, argv, "-t", sTrgDbf ) || sTrgDbf == "" ){
+    PrintHelp();
+    return 1;
+  }
 
   #ifdef XB_LOGGING_SUPPORT
   x.EnableMsgLogging();
   xbString sMsg;
-  sMsg.Sprintf( "Program [%s] initializing...", av[0] );
+  sMsg.Sprintf( "Program [%s] initializing...", argv[0] );
   x.WriteLogMessage( sMsg );
   #endif
 
-  if(( iRc = x.OpenHighestVersion( sFileName, "", &MyFile )) != XB_NO_ERROR ){
-    std::cout << "Could not open file iRc = " << iRc  << " file = "  << sFileName << std::endl;
+  if(( iRc = x.OpenHighestVersion( sSrcDbf, "", &dSrc )) != XB_NO_ERROR ){
+    std::cout << "Could not open file iRc = " << iRc  << " file = "  << sSrcDbf.Str() << std::endl;
     x.DisplayError( iRc );
-    return 0;
+    return 1;
   }
 
-  if(( iRc = MyFile->CopyDbfStructure( MyNewFile, tFileName, tFileName, XB_DONTOVERLAY, XB_SINGLE_USER )) != XB_NO_ERROR ){
-      std::cout << "Could not copy file " << tFileName << " Error = " << iRc  << "\n";
-      return 3;
+  #ifdef XB_DBF4_SUPPORT
+  dTrg = new xbDbf4( &x );
+  #else
+  dTrg = new xbDbf3( &x );
+  #endif
+
+  if(( iRc = dSrc->CopyDbfStructure( dTrg, sTrgDbf, sTrgDbf, XB_DONTOVERLAY, XB_SINGLE_USER )) != XB_NO_ERROR ){
+      std::cout << "Could not copy file " << sTrgDbf.Str() << " Error = " << iRc  << "\n";
+      x.DisplayError( iRc );
+      return 1;
   }
 
-  MyFile->Close();
+  x.CloseAllTables();
   return 0;
 }