give a descriptive error for pipe tries with 'false'

[apt.git] / apt-pkg / contrib / cdromutl.cc

diff --git a/apt-pkg/contrib/cdromutl.cc b/apt-pkg/contrib/cdromutl.cc
index 936e377fbfe6af2777bc2c6133e4eb945a6d552a..428ef01616383b210ac1981b0e4d44fef38cf1ec 100644 (file)
--- a/apt-pkg/contrib/cdromutl.cc
+++ b/apt-pkg/contrib/cdromutl.cc
@@ -207,7 +207,6 @@ bool IdentCdrom(string CD,string &Res,unsigned int Version)
    /* Run over the directory, we assume that the reader order will never
       change as the media is read-only. In theory if the kernel did
       some sort of wacked caching this might not be true.. */
    /* Run over the directory, we assume that the reader order will never
       change as the media is read-only. In theory if the kernel did
       some sort of wacked caching this might not be true.. */

-   char S[300];

    for (struct dirent *Dir = readdir(D); Dir != 0; Dir = readdir(D))
    {
       // Skip some files..
    for (struct dirent *Dir = readdir(D); Dir != 0; Dir = readdir(D))
    {
       // Skip some files..


@@ -215,30 +214,32 @@ bool IdentCdrom(string CD,string &Res,unsigned int Version)
          strcmp(Dir->d_name,"..") == 0)
         continue;
 
          strcmp(Dir->d_name,"..") == 0)
         continue;
 

+      std::string S;

       if (Version <= 1)
       {
       if (Version <= 1)
       {

-        sprintf(S,"%lu",(unsigned long)Dir->d_ino);
+        strprintf(S, "%lu", (unsigned long)Dir->d_ino);

       }
       else
       {
         struct stat Buf;
         if (stat(Dir->d_name,&Buf) != 0)
            continue;
       }
       else
       {
         struct stat Buf;
         if (stat(Dir->d_name,&Buf) != 0)
            continue;

-        sprintf(S,"%lu",(unsigned long)Buf.st_mtime);
+        strprintf(S, "%lu", (unsigned long)Buf.st_mtime);

       }
       }

-      
-      Hash.Add(S);
+
+      Hash.Add(S.c_str());

       Hash.Add(Dir->d_name);
    };
       Hash.Add(Dir->d_name);
    };

-   
+

    if (chdir(StartDir.c_str()) != 0) {
       _error->Errno("chdir",_("Unable to change to %s"),StartDir.c_str());
       closedir(D);
       return false;
    }
    closedir(D);
    if (chdir(StartDir.c_str()) != 0) {
       _error->Errno("chdir",_("Unable to change to %s"),StartDir.c_str());
       closedir(D);
       return false;
    }
    closedir(D);

-   
+

    // Some stats from the fsys
    // Some stats from the fsys

+   std::string S;

    if (_config->FindB("Debug::identcdrom",false) == false)
    {
       struct statvfs Buf;
    if (_config->FindB("Debug::identcdrom",false) == false)
    {
       struct statvfs Buf;


@@ -248,19 +249,19 @@ bool IdentCdrom(string CD,string &Res,unsigned int Version)
       // We use a kilobyte block size to advoid overflow
       if (writable_media)
       {
       // We use a kilobyte block size to advoid overflow
       if (writable_media)
       {

-         sprintf(S,"%lu",(long)(Buf.f_blocks*(Buf.f_bsize/1024)));
+         strprintf(S, "%lu", (unsigned long)(Buf.f_blocks*(Buf.f_bsize/1024)));

       } else {
       } else {

-         sprintf(S,"%lu %lu",(long)(Buf.f_blocks*(Buf.f_bsize/1024)),
-                 (long)(Buf.f_bfree*(Buf.f_bsize/1024)));
+         strprintf(S, "%lu %lu", (unsigned long)(Buf.f_blocks*(Buf.f_bsize/1024)),
+                 (unsigned long)(Buf.f_bfree*(Buf.f_bsize/1024)));

       }
       }

-      Hash.Add(S);
-      sprintf(S,"-%u",Version);
+      Hash.Add(S.c_str());
+      strprintf(S, "-%u", Version);

    }
    else
    }
    else

-      sprintf(S,"-%u.debug",Version);
-   
+      strprintf(S, "-%u.debug", Version);
+

    Res = Hash.Result().Value() + S;
    Res = Hash.Result().Value() + S;

-   return true;   
+   return true;

 }
                                                                        /*}}}*/
 // FindMountPointForDevice - Find mountpoint for the given device      /*{{{*/
 }
                                                                        /*}}}*/
 // FindMountPointForDevice - Find mountpoint for the given device      /*{{{*/


@@ -286,9 +287,11 @@ string FindMountPointForDevice(const char *devnode)
            fclose(f);
            // unescape the \0XXX chars in the path
            string mount_point = out[1];
            fclose(f);
            // unescape the \0XXX chars in the path
            string mount_point = out[1];

+           free(line);

            return DeEscapeString(mount_point);
         }
         fclose(f);
            return DeEscapeString(mount_point);
         }
         fclose(f);

+        free(line);

       }
 
    return string();
       }
 
    return string();