Changeset 755 for trunk/src/network/socket/qlocalsocket_os2.cpp

Timestamp:

Jun 22, 2010, 1:13:59 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

network/os2: QLocalServer/QLocalSocket: Make sure the socket path name always starts with "\socket\" (fixes #166) [based on patch by rudi].

File:

• trunk/src/network/socket/qlocalsocket_os2.cpp (modified) (1 diff)

trunk/src/network/socket/qlocalsocket_os2.cpp

@@ -271 +271 @@
     QString connectingPathName;
 
+
+
+
     // determine the full server path
-    if (connectingName.startsWith(QLatin1Char('/'))) {
-        connectingPathName = connectingName;
-    } else {
-        connectingPathName = QDir::tempPath();
-        connectingPathName += QLatin1Char('/') + connectingName;
+    connectingPathName = QDir::toNativeSeparators(connectingName);
+    if (!connectingName.startsWith(socketPath)) {
+        connectingPathName = socketPath + connectingName;
     }
 
     struct sockaddr_un name;
     name.sun_family = PF_UNIX;
-    if (sizeof(name.sun_path) < (uint)connectingPathName.toLatin1().size() + 1) {
+    name.sun_len = sizeof(sockaddr_un);
+    QByteArray cpn = connectingPathName.toLocal8Bit();
+    if (sizeof(name.sun_path) < (uint)cpn.size() + 1) {
         QString function = QLatin1String("QLocalSocket::connectToServer");
         errorOccurred(QLocalSocket::ServerNotFoundError, function);
         return;
     }
-    ::memcpy(name.sun_path, connectingPathName.toLatin1().data(),
-             connectingPathName.toLatin1().size() + 1);
+    ::
+
     if (-1 == ::connect(connectingSocket, (struct sockaddr *)&name, sizeof(name))) {
         QString function = QLatin1String("QLocalSocket::connectToServer");