truffle: src/os/bsd/vm/attachListener

Merge

comparison

equal deleted inserted replaced

-:b5c8a61d7fa0
+:f4f6ae481e1a
 addr.sun_family = AF_UNIX;
 strcpy(addr.sun_path, initial_path);
 ::unlink(initial_path);
 int res = ::bind(listener, (struct sockaddr*)&addr, sizeof(addr));
 if (res == -1) {
-RESTARTABLE(::close(listener), res);
+::close(listener);
 return -1;
 }
 // put in listen mode, set permissions, and rename into place
 res = ::listen(listener, 5);
 res = ::rename(initial_path, path);
 }
 }
 }
 if (res == -1) {
-RESTARTABLE(::close(listener), res);
+::close(listener);
 ::unlink(initial_path);
 return -1;
 }
 set_path(path);
 set_listener(listener);
 // get the credentials of the peer and check the effective uid/guid
 // - check with jeff on this.
 uid_t puid;
 gid_t pgid;
 if (::getpeereid(s, &puid, &pgid) != 0) {
-int res;
+::close(s);
-RESTARTABLE(::close(s), res);
 continue;
 }
 uid_t euid = geteuid();
 gid_t egid = getegid();
 if (puid != euid || pgid != egid) {
-int res;
+::close(s);
-RESTARTABLE(::close(s), res);
 continue;
 }
 // peer credential look okay so we read the request
 BsdAttachOperation* op = read_request(s);
 if (op == NULL) {
-int res;
+::close(s);
-RESTARTABLE(::close(s), res);
 continue;
 } else {
 return op;
 }
 }
 BsdAttachListener::write_fully(this->socket(), (char*) st->base(), st->size());
 ::shutdown(this->socket(), 2);
 }
 // done
-RESTARTABLE(::close(this->socket()), rc);
+::close(this->socket());
 // were we externally suspended while we were waiting?
 thread->check_and_wait_while_suspended();
 delete this;

Mercurial > hg > truffle