projects
/
oweals
/
dinit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d41ffb9
)
Improve some dinitctl error messages
author
Davin McCall
<davmac@davmac.org>
Sun, 1 Dec 2019 05:55:10 +0000
(15:55 +1000)
committer
Davin McCall
<davmac@davmac.org>
Sun, 1 Dec 2019 05:55:10 +0000
(15:55 +1000)
src/dinitctl.cc
patch
|
blob
|
history
diff --git
a/src/dinitctl.cc
b/src/dinitctl.cc
index b2af20b5e5c1a49209a95a06b28b6c3d13d88f3d..c33d42019e2f905f898e4ca9dd1fa6a902c0f7df 100644
(file)
--- a/
src/dinitctl.cc
+++ b/
src/dinitctl.cc
@@
-320,7
+320,8
@@
int main(int argc, char **argv)
control_socket_path = control_socket_str.c_str();
}
else {
control_socket_path = control_socket_str.c_str();
}
else {
- cerr << "Cannot locate user home directory (set HOME or check /etc/passwd file)" << endl;
+ cerr << "dinitctl: Cannot locate user home directory (set HOME, check /etc/passwd file, or "
+ "specify socket path via -p)" << endl;
return 1;
}
}
return 1;
}
}
@@
-328,7
+329,7
@@
int main(int argc, char **argv)
int socknum = socket(AF_UNIX, SOCK_STREAM, 0);
if (socknum == -1) {
int socknum = socket(AF_UNIX, SOCK_STREAM, 0);
if (socknum == -1) {
- perror("dinitctl: socket");
+ perror("dinitctl:
error opening
socket");
return 1;
}
return 1;
}
@@
-345,7
+346,7
@@
int main(int argc, char **argv)
int connr = connect(socknum, (struct sockaddr *) name, sockaddr_size);
if (connr == -1) {
int connr = connect(socknum, (struct sockaddr *) name, sockaddr_size);
if (connr == -1) {
- perror(
"dinitctl: connect"
);
+ perror(
(std::string("dinitctl: connecting to socket ") + control_socket_path).c_str()
);
return 1;
}
return 1;
}