Compare commits
No commits in common. "master" and "1.1.0" have entirely different histories.
|
@ -29,8 +29,9 @@ void do_log(int level, const char* fmt, ...)
|
||||||
|
|
||||||
va_start(va, fmt);
|
va_start(va, fmt);
|
||||||
|
|
||||||
|
if(Daemon) {
|
||||||
vsyslog(level, fmt, va);
|
vsyslog(level, fmt, va);
|
||||||
if(!Daemon) {
|
} else {
|
||||||
FILE* out = stdout;
|
FILE* out = stdout;
|
||||||
|
|
||||||
switch(level) {
|
switch(level) {
|
||||||
|
@ -127,7 +128,6 @@ int setup_socket(const char* name, int perms)
|
||||||
addr.sun_family = AF_UNIX;
|
addr.sun_family = AF_UNIX;
|
||||||
strcpy(addr.sun_path, name); // main() ensures it is less than UNIX_PATH_MAX bytes
|
strcpy(addr.sun_path, name); // main() ensures it is less than UNIX_PATH_MAX bytes
|
||||||
|
|
||||||
unlink(name); // unlink any existing socket, but ignore errors
|
|
||||||
if(bind(fd, (struct sockaddr*)&addr, sizeof(addr))) {
|
if(bind(fd, (struct sockaddr*)&addr, sizeof(addr))) {
|
||||||
LOG(LOG_CRIT, "Couldn't bind socket (fd %d) to file ``%s'' - %s (%d).",
|
LOG(LOG_CRIT, "Couldn't bind socket (fd %d) to file ``%s'' - %s (%d).",
|
||||||
fd, name, strerror(errno), errno);
|
fd, name, strerror(errno), errno);
|
||||||
|
|
2
version
2
version
|
@ -12,7 +12,7 @@
|
||||||
# suffixed with a string.
|
# suffixed with a string.
|
||||||
VERMAJOR=1
|
VERMAJOR=1
|
||||||
VERMINOR=1
|
VERMINOR=1
|
||||||
VERMICRO=1
|
VERMICRO=0
|
||||||
VEREXTRA=""
|
VEREXTRA=""
|
||||||
|
|
||||||
# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
|
# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
|
||||||
|
|
Loading…
Reference in New Issue