提交: c7f267cd12fc253c0844720fb05c010614aa89a1 - textmate (git)

TextMate is a graphical text editor for OS X 10.7+

Commit MetaInfo

• 修訂: c7f267cd12fc253c0844720fb05c010614aa89a1 (tree)
• 時間: 2012-08-18 22:30:24
• 作者: Allan Odgaard <git@abet...>
• Commiter: Allan Odgaard

Log Message

Show error if failing to unlink old socket

This is in response to issue #183.

Change Summary

• modified: Applications/TextMate/src/RMateServer.cc

差異

--- a/Applications/TextMate/src/RMateServer.cc
+++ b/Applications/TextMate/src/RMateServer.cc
@@ -124,7 +124,11 @@ namespace
 		mate_server_t () : _socket_path(path::join(path::temp(), "textmate.sock"))
 		{
 			D(DBF_RMateServer, bug("%s\n", _socket_path.c_str()););
-			unlink(_socket_path.c_str());
+			if(unlink(_socket_path.c_str()) == -1 && errno != ENOENT)
+			{
+				OakRunIOAlertPanel("Unable to delete socket left from old instance:\n%s", _socket_path.c_str());
+				return;
+			}
 
 			socket_t fd(socket(AF_UNIX, SOCK_STREAM, 0));
 			fcntl(fd, F_SETFD, 1);