deal with empty values properly in deb822 parser

[apt.git] / methods / rred.cc

diff --git a/methods/rred.cc b/methods/rred.cc
index 89d7069848811048f1fa1b7a7ba20791b6e08b4d..80f8746c7176bd4cdf9833762f73203eae5e1531 100644 (file)
--- a/methods/rred.cc
+++ b/methods/rred.cc
@@ -531,6 +531,7 @@ class Patch {
         dump_mem(out, ch->add, ch->add_len, hash);
       }
       dump_rest(out, in, hash);
         dump_mem(out, ch->add, ch->add_len, hash);
       }
       dump_rest(out, in, hash);

+      out.Flush();

    }
 };
 
    }
 };
 


@@ -643,7 +644,7 @@ class RredMethod : public aptMethod {
            std::cerr << "FAILED to open inp " << Path << std::endl;
            return _error->Error("Failed to open inp %s", Path.c_str());
         }
            std::cerr << "FAILED to open inp " << Path << std::endl;
            return _error->Error("Failed to open inp %s", Path.c_str());
         }

-        if (out.Open(Itm->DestFile, FileFd::WriteOnly | FileFd::Create, FileFd::Extension) == false)
+        if (out.Open(Itm->DestFile, FileFd::WriteOnly | FileFd::Create | FileFd::BufferedWrite, FileFd::Extension) == false)

         {
            std::cerr << "FAILED to open out " << Itm->DestFile << std::endl;
            return _error->Error("Failed to open out %s", Itm->DestFile.c_str());
         {
            std::cerr << "FAILED to open out " << Itm->DestFile << std::endl;
            return _error->Error("Failed to open out %s", Itm->DestFile.c_str());


@@ -693,8 +694,6 @@ int main(int argc, char **argv)
    bool test = false;
    Patch patch;
 
    bool test = false;
    Patch patch;
 

-   pkgInitConfig(*_config);
-

    if (argc <= 1) {
       RredMethod Mth;
       return Mth.Run();
    if (argc <= 1) {
       RredMethod Mth;
       return Mth.Run();


@@ -702,6 +701,8 @@ int main(int argc, char **argv)
 
    // Usage: rred -t input output diff ...
    if (argc > 1 && strcmp(argv[1], "-t") == 0) {
 
    // Usage: rred -t input output diff ...
    if (argc > 1 && strcmp(argv[1], "-t") == 0) {

+      // Read config files so we see compressors.
+      pkgInitConfig(*_config);

       just_diff = false;
       test = true;
       i = 4;
       just_diff = false;
       test = true;
       i = 4;


@@ -729,17 +730,20 @@ int main(int argc, char **argv)
       FileFd out, inp;
       std::cerr << "Patching " << argv[2] << " into " << argv[3] << "\n";
       inp.Open(argv[2], FileFd::ReadOnly,FileFd::Extension);
       FileFd out, inp;
       std::cerr << "Patching " << argv[2] << " into " << argv[3] << "\n";
       inp.Open(argv[2], FileFd::ReadOnly,FileFd::Extension);

-      out.Open(argv[3], FileFd::WriteOnly | FileFd::Create, FileFd::Extension);
+      out.Open(argv[3], FileFd::WriteOnly | FileFd::Create | FileFd::BufferedWrite, FileFd::Extension);

       patch.apply_against_file(out, inp);
       patch.apply_against_file(out, inp);

+      out.Close();

    } else if (just_diff) {
       FileFd out;
       out.OpenDescriptor(STDOUT_FILENO, FileFd::WriteOnly | FileFd::Create);
       patch.write_diff(out);
    } else if (just_diff) {
       FileFd out;
       out.OpenDescriptor(STDOUT_FILENO, FileFd::WriteOnly | FileFd::Create);
       patch.write_diff(out);

+      out.Close();

    } else {
       FileFd out, inp;
    } else {
       FileFd out, inp;

-      out.OpenDescriptor(STDOUT_FILENO, FileFd::WriteOnly | FileFd::Create);
+      out.OpenDescriptor(STDOUT_FILENO, FileFd::WriteOnly | FileFd::Create | FileFd::BufferedWrite);

       inp.OpenDescriptor(STDIN_FILENO, FileFd::ReadOnly);
       patch.apply_against_file(out, inp);
       inp.OpenDescriptor(STDIN_FILENO, FileFd::ReadOnly);
       patch.apply_against_file(out, inp);

+      out.Close();

    }
    return 0;
 }
    }
    return 0;
 }