Work around SANE leaking file descriptors at sane_exit()

sanecpp/sanecpp.cpp

@@ -63,8 +63,6 @@ std::ostream log(nullptr);
 
 option option_set::s_nulloption;
 
-// we call sane_exit() as frequently as possible
-// in order to minimize effects from bugs/leaks in backends
 static int sane_init_refcount = 0;
 static std::mutex sane_init_mutex;
 
@@ -89,6 +87,16 @@ sane_init_release()
  }
 }
 
+init::init()
+{
+ sane_init_addref();
+}
+
+init::~init()
+{
+ sane_init_release();
+}
+
 option_set::option_set() {}
 
 option_set::option_set(device_handle h)

sanecpp/sanecpp.h

@@ -38,6 +38,12 @@ dtostr_c(double);
 // will enable logging to stderr
 extern std::ostream log;
 
+struct init
+{
+ init();
+ ~init();
+};
+
 struct device_info
 {
  std::string name, vendor, model, type;

server/server.cpp

@@ -84,6 +84,7 @@ struct NetworkNotifier : NetworkHotplugNotifier
  switch (ev) {
  case addressArrived:
  case addressLeft:
+ case addressChange:
  std::clog << "network hotplug event, reloading configuration" << std::endl;
  server.terminate(SIGHUP);
  break;
@@ -267,6 +268,8 @@ Server::run()
  std::shared_ptr<NetworkNotifier> pNetworkNotifier;
  if (mNetworkhotplug)
  pNetworkNotifier = std::make_shared<NetworkNotifier>(*this);
+
+ sanecpp::init saneinit;
 
  bool ok = false, done = false;
  do {