myserver-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[myserver-commit] [3051] Copy the right default configuration files when


From: Giuseppe Scrivano
Subject: [myserver-commit] [3051] Copy the right default configuration files when they are missing.
Date: Sun, 12 Apr 2009 20:43:01 +0000

Revision: 3051
          http://svn.sv.gnu.org/viewvc/?view=rev&root=myserver&revision=3051
Author:   gscrivano
Date:     2009-04-12 20:43:00 +0000 (Sun, 12 Apr 2009)
Log Message:
-----------
Copy the right default configuration files when they are missing.

Modified Paths:
--------------
    trunk/myserver/src/server/server.cpp

Modified: trunk/myserver/src/server/server.cpp
===================================================================
--- trunk/myserver/src/server/server.cpp        2009-04-07 16:41:47 UTC (rev 
3050)
+++ trunk/myserver/src/server/server.cpp        2009-04-12 20:43:00 UTC (rev 
3051)
@@ -194,23 +194,29 @@
   File inputF;
   File outputF;
   int ret;
-  string sSource(fileName);
+  string sSource (fileName);
+  sSource = sSource.substr (0, sSource.length () - 3);
 
-  sSource.append(".default");
-  ret = inputF.openFile(sSource, File::MYSERVER_OPEN_READ
-      | File::MYSERVER_OPEN_IFEXISTS);
+#ifdef WIN32
+  sSource.append ("default.windows.xml");
+#else
+  sSource.append ("default.xml");
+#endif
+
+  ret = inputF.openFile (sSource, File::MYSERVER_OPEN_READ
+                        | File::MYSERVER_OPEN_IFEXISTS);
   if (ret)
     return -1;
 
-  ret = outputF.openFile(fileName, File::MYSERVER_OPEN_WRITE
-      | File::MYSERVER_OPEN_ALWAYS);
+  ret = outputF.openFile (fileName, File::MYSERVER_OPEN_WRITE
+                         | File::MYSERVER_OPEN_ALWAYS);
   if (ret)
     return -1;
 
-  FilesUtility::copyFile(inputF, outputF);
+  FilesUtility::copyFile (inputF, outputF);
 
-  inputF.close();
-  outputF.close();
+  inputF.close ();
+  outputF.close ();
 
   return 0;
 }





reply via email to

[Prev in Thread] Current Thread [Next in Thread]