Changeset 475

Timestamp:

Aug 31, 2007, 3:27:33 PM (14 years ago)

Author:

Peter Johansson

Message:

Merged patch release 0.6.3 to trunk. Delta 0.6.3 - 0.6.2

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• NEWS (modified) (1 diff)
• bin/Parameter.cc (modified) (5 diffs)
• lib/File.cc (modified) (1 diff)

trunk/ChangeLog

@@ -31 +31 @@
   - http://trac.thep.lu.se/trac/svndigest/query?milestone=0.7&order=id
 
+version 0.6.3:
+  - http://trac.thep.lu.se/trac/svndigest/log/branches/0.6-stable?rev=472&stop_rev=460
+  - http://trac.thep.lu.se/trac/svndigest/query?milestone=0.6.3&order=id
+
 version 0.6.2:
   - http://trac.thep.lu.se/trac/svndigest/log/branches/0.6-stable?rev=459&stop_rev=438

trunk/NEWS

@@ -7 +7 @@
   A complete list of closed tickets can be found here [[br]]
   http://lev.thep.lu.se/trac/svndigest/query?status=closed&milestone=0.7
+
+version 0.6.3 (released 31 August 2007)
+  - Copyright update is no longer adding newline to file (ticket:264)
+  - Commandline parsing now accepts '=' syntax (ticket:259)
+
+  A complete list of closed tickets can be found here [[br]]
+  http://trac.thep.lu.se/trac/svndigest/query?status=closed&milestone=0.6.3
 
 Version 0.6.2 (released 21 August 2007)

trunk/bin/Parameter.cc

@@ -2 +2 @@
 
 /*
-  Copyright (C) 2006, 2007 Jari Häkkinen, Peter Johansson
+  Copyright (C) 2006, 2007 Jari Häkkinen, Peter Johansson
 
   This file is part of svndigest, http://trac.thep.lu.se/trac/svndigest
@@ -43 +43 @@
     for (int i=1; i<argc; ++i) {
       bool ok=false;
-      std::string myargv(argv[i]);
+      std::stringstream ss(argv[i]);
+      std::string myargv("");
+      std::string value("");
+      getline(ss, myargv, '=');
+      getline(ss, value);
+
       if (myargv=="--config-file"){
-        if (++i<argc){
+        if (value.size()) {
+          config_file_= value;
+          ok=true;
+        }
+        else if (++i<argc){
           config_file_= std::string(argv[i]);
           ok=true;
@@ -67 +76 @@
       }
       else if (myargv=="-r" || myargv=="--root"){
-        if (++i<argc){
+        if (value.size()) {
+          root_= value;
+          ok=true;
+        }
+        else if (++i<argc){
           root_= std::string(argv[i]);
           ok=true;
@@ -85 +98 @@
       }
       else if (myargv=="-t" || myargv=="--target"){
-        if (++i<argc){
+        if (value.size()) {
+          targetdir_= value;
+          ok=true;
+        }
+        else if (++i<argc){
           targetdir_= std::string(argv[i]);
           ok=true;
@@ -219 +236 @@
     cs.width(0)=79;
     cs << PACKAGE_STRING
-       << "\nCopyright (C) 2007 Jari Häkkinen and Peter Johansson.\n\n"
+       << "\nCopyright (C) 2007 Jari Häkkinen and Peter Johansson.\n\n"
        << "This is free software; see the source for copying conditions. "
        << "There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR "

trunk/lib/File.cc

@@ -357 +357 @@
     }
     // Copy lines after block
-    while(getline(is, line))
-      tmp << line << "\n";
+    while(is.good()) {
+      char ch=is.get();
+      if (i.good())
+        tmp.put(ch);
+    }
 
     is.close();