[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/kinit
From:       Oswald Buddenhagen <ossi () kde ! org>
Date:       2009-04-19 13:00:40
Message-ID: 1240146040.514115.30978.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 956147 by ossi:

purge dead code - after ~2.5 years

 M  +0 -123    kinit.cpp  


--- trunk/KDE/kdelibs/kinit/kinit.cpp #956146:956147
@@ -102,7 +102,6 @@
 static KComponentData *s_instance = 0;
 #define MAX_SOCK_FILE 255
 static char sock_file[MAX_SOCK_FILE];
-//static char sock_file_old[MAX_SOCK_FILE];
 
 #ifdef Q_WS_X11
 #define DISPLAY "DISPLAY"
@@ -124,7 +123,6 @@
   int deadpipe[2]; /* pipe used to detect dead children */
   int initpipe[2];
   int wrapper; /* socket for wrapper communication */
-  int wrapper_old; /* old socket for wrapper communication */
   int accepted_fd; /* socket accepted and that must be closed in the child process \
*/  char result;
   int exit_status;
@@ -224,11 +222,6 @@
       close(d.wrapper);
       d.wrapper = -1;
    }
-   if (d.wrapper_old != -1)
-   {
-      close(d.wrapper_old);
-      d.wrapper_old = -1;
-   }
    if (d.accepted_fd != -1)
    {
       close(d.accepted_fd);
@@ -844,7 +837,6 @@
 static void init_kdeinit_socket()
 {
   struct sockaddr_un sa;
-  //struct sockaddr_un sa_old;
   kde_socklen_t socklen;
   long options;
   const QByteArray home_dir = qgetenv("HOME");
@@ -927,7 +919,6 @@
 
   /** Delete any stale socket file (and symlink) **/
   unlink(sock_file);
-//  unlink(sock_file_old);
 
   /** create socket **/
   d.wrapper = socket(PF_UNIX, SOCK_STREAM, 0);
@@ -988,80 +979,6 @@
      close(d.wrapper);
      exit(255);
   }
-
-#if 0
-  /** create compatibility socket **/
-  d.wrapper_old = socket(PF_UNIX, SOCK_STREAM, 0);
-  if (d.wrapper_old < 0)
-  {
-     // perror("kdeinit4: Aborting. socket() failed");
-     return;
-  }
-
-  options = fcntl(d.wrapper_old, F_GETFL);
-  if (options == -1)
-  {
-     // perror("kdeinit4: Aborting. Can't make socket non-blocking");
-     close(d.wrapper_old);
-     d.wrapper_old = -1;
-     return;
-  }
-
-  if (fcntl(d.wrapper_old, F_SETFL, options | O_NONBLOCK) == -1)
-  {
-     // perror("kdeinit4: Aborting. Can't make socket non-blocking");
-     close(d.wrapper_old);
-     d.wrapper_old = -1;
-     return;
-  }
-
-  if (fcntl(d.wrapper, F_SETFD, FD_CLOEXEC) == -1)
-  {
-     //perror("kdeinit4: Aborting. Can't make socket close-on-execute");
-     close(d.wrapper);
-     d.wrapper_old = -1;
-     return;
-  }
-
-  max_tries = 10;
-  while (1) {
-      /** bind it **/
-      socklen = sizeof(sa_old);
-      memset(&sa_old, 0, socklen);
-      sa_old.sun_family = AF_UNIX;
-      strcpy(sa_old.sun_path, sock_file_old);
-      if(bind(d.wrapper_old, (struct sockaddr *)&sa_old, socklen) != 0)
-      {
-          if (max_tries == 0) {
-	      // perror("kdeinit4: Aborting. bind() failed");
-	      fprintf(stderr, "Could not bind to socket '%s'\n", sock_file_old);
-	      close(d.wrapper_old);
-	      d.wrapper_old = -1;
-	      return;
-	  }
-	  max_tries--;
-      } else
-          break;
-  }
-
-  /** set permissions **/
-  if (chmod(sock_file_old, 0600) != 0)
-  {
-     fprintf(stderr, "Wrong permissions of socket '%s'\n", sock_file);
-     unlink(sock_file_old);
-     close(d.wrapper_old);
-     d.wrapper_old = -1;
-     return;
-  }
-
-  if(listen(d.wrapper_old, SOMAXCONN) < 0)
-  {
-     // perror("kdeinit4: Aborting. listen() failed");
-     unlink(sock_file_old);
-     close(d.wrapper_old);
-     d.wrapper_old = -1;
-  }
-#endif
 }
 
 /*
@@ -1355,8 +1272,6 @@
 static void handle_requests(pid_t waitForPid)
 {
    int max_sock = d.wrapper;
-   if (d.wrapper_old > max_sock)
-      max_sock = d.wrapper_old;
    if (d.launcher_pid && (d.launcher[0] > max_sock))
       max_sock = d.launcher[0];
 #ifdef Q_WS_X11
@@ -1411,10 +1326,6 @@
          FD_SET(d.launcher[0], &rd_set);
       }
       FD_SET(d.wrapper, &rd_set);
-      if (d.wrapper_old != -1)
-      {
-         FD_SET(d.wrapper_old, &rd_set);
-      }
       FD_SET(d.deadpipe[0], &rd_set);
 #ifdef Q_WS_X11
       if(X11fd >= 0) FD_SET(X11fd, &rd_set);
@@ -1434,17 +1345,6 @@
             close(sock);
          }
       }
-      if ((result > 0) && d.wrapper_old != -1 && (FD_ISSET(d.wrapper_old, &rd_set)))
-      {
-         struct sockaddr_un client;
-         kde_socklen_t sClient = sizeof(client);
-         int sock = accept(d.wrapper_old, (struct sockaddr *)&client, &sClient);
-         if (sock >= 0)
-         {
-            handle_launcher_request(sock);
-            close(sock);
-         }
-      }
 
       /* Handle launcher request */
       if ((result > 0) && (d.launcher_pid) && (FD_ISSET(d.launcher[0], &rd_set)))
@@ -1530,21 +1430,6 @@
    if((i = display.lastIndexOf('.')) > display.lastIndexOf(':') && i >= 0)
      display.truncate(i);
 
-   // Was kdeinit-display initially,
-   // then at some point in KDE-3.x it became kdeinit_display_with_underscores
-   // And for KDE4 it became kdeinit4_display_with_underscores, to avoid messing up \
                the kde3 kdeinit.
-   // Compat code needed just in case we need it later for something else.
-#if 0
-   QByteArray socketName = QFile::encodeName(locateLocal("socket", \
                QString("kdeinit-%1").arg(QLatin1String(display)), *s_instance));
-   if (socketName.length() >= MAX_SOCK_FILE)
-   {
-     fprintf(stderr, "kdeinit4: Aborting. Socket name will be too long:\n");
-     fprintf(stderr, "         '%s'\n", socketName.data());
-     exit(255);
-   }
-   strcpy(sock_file_old, socketName.data());
-#endif
-
    display.replace(':','_');
 #ifdef __APPLE__
    display.replace('/','_');
@@ -1573,13 +1458,6 @@
       /** Delete any stale socket file **/
       unlink(sock_file);
     }
-#if 0
-    if (sock_file_old[0])
-    {
-      /** Delete any stale socket file **/
-      unlink(sock_file_old);
-    }
-#endif
 
     // Don't kill our children in suicide mode, they may still be in use
     if (d.suicide)
@@ -1796,7 +1674,6 @@
    d.launcher_pid = 0;
    d.kded_pid = 0;
    d.wrapper = -1;
-   d.wrapper_old = -1;
    d.accepted_fd = -1;
    d.debug_wait = false;
    d.launcher_ok = false;


[prev in list] [next in list] [prev in thread] [next in thread]