From e174bc3c99e3b5d93002455824d8bf9b1e4ddd51 Mon Sep 17 00:00:00 2001
From: Carsten Haitzler <raster@rasterman.com>
Date: Sat, 21 Jul 2012 09:11:00 +0000
Subject: [PATCH] 1. let us not install eeze_scanner in e17's utils dir. really
 not nice to do that. 2. just use regular ecore-con naming of the socket. it
 will handle if someone else has it. no need to do tmpdir and filename stuff
 by hand.

SVN revision: 74261
---
 legacy/eeze/src/bin/Makefile.am    |  4 ++--
 legacy/eeze/src/bin/eeze_scanner.c | 33 ++----------------------------
 2 files changed, 4 insertions(+), 33 deletions(-)

diff --git a/legacy/eeze/src/bin/Makefile.am b/legacy/eeze/src/bin/Makefile.am
index abf27aedd0..280006d835 100644
--- a/legacy/eeze/src/bin/Makefile.am
+++ b/legacy/eeze/src/bin/Makefile.am
@@ -17,7 +17,7 @@ endif
 
 bin_PROGRAMS = $(DISK_PROGS)
 util_PROGRAMS = $(SCAN_PROGS)
-utildir = @libdir@/enlightenment/utils
+utildir = $(bindir)
 
 eeze_udev_test_SOURCES = eeze_udev_test.c
 eeze_udev_test_CPPFLAGS = -I$(top_srcdir)/src/lib @EEZE_CFLAGS@
@@ -44,6 +44,6 @@ if HAVE_EEZE_MOUNT
 
 setuid_root_mode = a=rx,u+xs
 install-data-hook:
-	@chmod $(setuid_root_mode) $(DESTDIR)$(libdir)/enlightenment/utils/eeze_scanner$(EXEEXT) || true
+	@chmod $(setuid_root_mode) $(DESTDIR)$(bindir)/eeze_scanner$(EXEEXT) || true
 
 endif
diff --git a/legacy/eeze/src/bin/eeze_scanner.c b/legacy/eeze/src/bin/eeze_scanner.c
index 1a5fe591ac..f7a0c03411 100644
--- a/legacy/eeze/src/bin/eeze_scanner.c
+++ b/legacy/eeze/src/bin/eeze_scanner.c
@@ -386,17 +386,7 @@ cb_stor_chg(const char *device, Eeze_Udev_Event ev, void *data __UNUSED__, Eeze_
 static void
 es_exit(int sig)
 {
-   const char *tmp;
-   char buf[1024];
-   struct stat st;
    ecore_con_server_del(svr);
-
-   tmp = getenv("TMPDIR");
-   if (!tmp) tmp = "/tmp";
-
-   snprintf(buf, sizeof(buf), "%s/.ecore_service|eeze_scanner|0", tmp);
-   if (!stat(buf, &st))
-     unlink(buf);
    exit(sig);   
 }
 
@@ -422,10 +412,6 @@ sigs_setup(void)
 int
 main(void)
 {
-   const char *tmp;
-   char buf[128], buf2[128];
-   struct stat st;
-
    eina_init();
    ecore_init();
    ecore_con_init();
@@ -436,16 +422,6 @@ main(void)
    sigs_setup();
    es_log_dom = eina_log_domain_register("eeze_scanner", EINA_COLOR_CYAN);
 
-   tmp = getenv("TMPDIR");
-   if (!tmp) tmp = "/tmp";
-
-   snprintf(buf, sizeof(buf), "%s/.ecore_service|eeze_scanner", tmp);
-   snprintf(buf2, sizeof(buf), "%s/.ecore_service|eeze_scanner|0", tmp);
-   if (!stat(buf2, &st))
-     {
-        ERR("Socket file '%s' for scanner already exists! Refusing to start up!", buf2);
-        exit(1);
-     }
    eet_setup();
    clients = eina_hash_pointer_new(NULL);
    EINA_SAFETY_ON_NULL_GOTO(clients, error);
@@ -460,14 +436,9 @@ main(void)
    eeze_udev_watch_add(EEZE_UDEV_TYPE_DRIVE_CDROM, EEZE_UDEV_EVENT_NONE, cb_stor_chg, NULL);
    eeze_udev_watch_add(EEZE_UDEV_TYPE_DRIVE_MOUNTABLE, EEZE_UDEV_EVENT_NONE, cb_vol_chg, NULL);
 
-   svr = ecore_con_server_add(ECORE_CON_LOCAL_SYSTEM, buf, 0, NULL);
+   svr = ecore_con_server_add(ECORE_CON_LOCAL_SYSTEM, "eeze_scanner", 0, NULL);
    EINA_SAFETY_ON_NULL_GOTO(svr, error);
-   if (chmod(buf2, S_IRWXU | S_IRWXG | S_IRWXO))
-     {
-        ERR("Could not chmod socket (%s)! \"%s\"", buf, strerror(errno));
-        goto error;
-     }
-
+   
    storage_setup();
    ecore_main_loop_begin();