Skip to content
Snippets Groups Projects
Commit 9184a6f3 authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

the TCP patch broke UNIX sockets on Windows (since Windows paths already
contain a colon)
parent eaf74cd1
No related branches found
No related tags found
No related merge requests found
/* $Id: GmshServer.cpp,v 1.21 2004-12-06 07:30:28 geuzaine Exp $ */ /* $Id: GmshServer.cpp,v 1.22 2005-01-01 01:49:19 geuzaine Exp $ */
/* /*
* Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle * Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle
* *
...@@ -109,10 +109,17 @@ int Gmsh_StartClient(char *command, char *sockname) ...@@ -109,10 +109,17 @@ int Gmsh_StartClient(char *command, char *sockname)
return 1; return 1;
} }
if(!(port = strstr(sockname, ":"))) if(strstr(sockname, "/") || strstr(sockname, "\\") || !strstr(sockname, ":")){
portno = -1; /* UNIX socket */ /* UNIX socket (testing ":" is not enough with Windows paths) */
else portno = -1;
portno = atoi(port+1); /* INET socket */ }
else{
/* INET socket */
port = strstr(sockname, ":");
if(!port)
return -1; /* Error: Couldn't create socket */
portno = atoi(port+1);
}
if(portno < 0){ if(portno < 0){
/* delete the file if it already exists */ /* delete the file if it already exists */
...@@ -203,9 +210,11 @@ int Gmsh_ReceiveString(int socket, int *type, char str[]) ...@@ -203,9 +210,11 @@ int Gmsh_ReceiveString(int socket, int *type, char str[])
int Gmsh_StopClient(char *sockname, int sock) int Gmsh_StopClient(char *sockname, int sock)
{ {
if(!strstr(sockname, ":")) if(strstr(sockname, "/") || strstr(sockname, "\\") || !strstr(sockname, ":")){
/* UNIX socket */
if(Socket_UnlinkName(sockname) == -1) if(Socket_UnlinkName(sockname) == -1)
return -1; /* Impossible to unlink the socket */ return -1; /* Impossible to unlink the socket */
}
close(sock); close(sock);
return 0; return 0;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment