send the first line of the error message to the error list and fail a bit

[apt.git] / apt-pkg / cdrom.h

diff --git a/apt-pkg/cdrom.h b/apt-pkg/cdrom.h
index 085eb64e24e7aba216cb7e76e3d9523922d1f12f..e83c385829bfc965fb3279ff440118198ac371ce 100644 (file)
--- a/apt-pkg/cdrom.h
+++ b/apt-pkg/cdrom.h
@@ -5,13 +5,10 @@
 #include<string>
 #include<vector>
 
-#ifdef __GNUG__
-#pragma interface "apt-pkg/cdrom.h"
-#endif
 
 using namespace std;
 
-class pkgCdromStatus
+class pkgCdromStatus                                                   /*{{{*/
 {
  protected:
    int totalSteps;
@@ -32,8 +29,8 @@ class pkgCdromStatus
    // Progress indicator for the Index rewriter
    virtual OpProgress* GetOpProgress() {return NULL; };
 };
-
-class pkgCdrom 
+                                                                       /*}}}*/
+class pkgCdrom                                                         /*{{{*/
 {
  protected:
    enum {
@@ -50,8 +47,11 @@ class pkgCdrom
    };
 
 
-   bool FindPackages(string CD,vector<string> &List,
-                    vector<string> &SList, vector<string> &SigList,
+   bool FindPackages(string CD,
+                    vector<string> &List,
+                    vector<string> &SList, 
+                    vector<string> &SigList,
+                    vector<string> &TransList,
                     string &InfoDir, pkgCdromStatus *log,
                     unsigned int Depth = 0);
    bool DropBinaryArch(vector<string> &List);
@@ -65,7 +65,51 @@ class pkgCdrom
    bool Ident(string &ident, pkgCdromStatus *log);
    bool Add(pkgCdromStatus *log);
 };
+                                                                       /*}}}*/
+
+
+// class that uses libudev to find cdrom/removable devices dynamically
+struct CdromDevice                                                     /*{{{*/
+{
+   string DeviceName;
+   bool Mounted;
+   string MountPath;
+};
+                                                                       /*}}}*/
+class pkgUdevCdromDevices                                              /*{{{*/
+{
+ protected:
+   // libudev dlopen stucture
+   void *libudev_handle;
+   struct udev* (*udev_new)(void);
+   int (*udev_enumerate_add_match_property)(struct udev_enumerate *udev_enumerate, const char *property, const char *value);
+   int (*udev_enumerate_scan_devices)(struct udev_enumerate *udev_enumerate);
+   struct udev_list_entry* (*udev_enumerate_get_list_entry)(struct udev_enumerate *udev_enumerate);
+   struct udev_device* (*udev_device_new_from_syspath)(struct udev *udev, const char *syspath);
+   struct udev* (*udev_enumerate_get_udev)(struct udev_enumerate *udev_enumerate);
+   const char* (*udev_list_entry_get_name)(struct udev_list_entry *list_entry);
+   const char* (*udev_device_get_devnode)(struct udev_device *udev_device);
+   struct udev_enumerate *(*udev_enumerate_new) (struct udev *udev);
+   struct udev_list_entry *(*udev_list_entry_get_next)(struct udev_list_entry *list_entry);
+   const char* (*udev_device_get_property_value)(struct udev_device *udev_device, const char *key);
+#if 0 // FIXME: uncomment on next ABI break
+   int (*udev_enumerate_add_match_sysattr)(struct udev_enumerate *udev_enumerate, const char *property, const char *value);
+#endif 
+   // end libudev dlopen
+   
+ public:
+   pkgUdevCdromDevices();
+   virtual ~pkgUdevCdromDevices();
+
+   // try to open 
+   bool Dlopen();
 
+   // this is the new interface
+   vector<CdromDevice> ScanForRemovable(bool CdromOnly);
+   // FIXME: compat with the old interface/API/ABI only
+   vector<CdromDevice> Scan();
 
+};
+                                                                       /*}}}*/
 
 #endif