ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

uuidd: print all debugging information to stderr 

Signed-off-by: Petr Uzel <petr.uzel@suse.cz>
This commit is contained in:
Petr Uzel 2012-05-03 21:01:55 +02:00 committed by Karel Zak
parent bbe289c489
commit 18c68d70ee
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
misc-utils/uuidd.c
View File

@ -335,7 +335,8 @@ static void server_loop(const char *socket_path, const char *pidfile_path,
sizeof(reply_buf), 0, NULL); sizeof(reply_buf), 0, NULL);
if (ret > 0) { if (ret > 0) {
if (!quiet) if (!quiet)
printf(_("uuidd daemon already running at pid %s\n"), fprintf(stderr,
_("uuidd daemon already running at pid %s\n"),
reply_buf); reply_buf);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
@ -396,7 +397,7 @@ static void server_loop(const char *socket_path, const char *pidfile_path,
if (len < 0) if (len < 0)
perror("read"); perror("read");
else else
printf(_("Error reading from client, " fprintf(stderr, _("Error reading from client, "
"len = %d\n"), len); "len = %d\n"), len);
goto shutdown_socket; goto shutdown_socket;
} }
@ -405,10 +406,10 @@ static void server_loop(const char *socket_path, const char *pidfile_path,
if (read_all(ns, (char *) &num, sizeof(num)) != 4) if (read_all(ns, (char *) &num, sizeof(num)) != 4)
goto shutdown_socket; goto shutdown_socket;
if (debug) if (debug)
printf(_("operation %d, incoming num = %d\n"), fprintf(stderr, _("operation %d, incoming num = %d\n"),
op, num); op, num);
} else if (debug) } else if (debug)
printf(_("operation %d\n"), op); fprintf(stderr, _("operation %d\n"), op);
switch (op) { switch (op) {
case UUIDD_OP_GETPID: case UUIDD_OP_GETPID:
@ -424,7 +425,7 @@ static void server_loop(const char *socket_path, const char *pidfile_path,
__uuid_generate_time(uu, &num); __uuid_generate_time(uu, &num);
if (debug) { if (debug) {
uuid_unparse(uu, str); uuid_unparse(uu, str);
printf(_("Generated time UUID: %s\n"), str); fprintf(stderr, _("Generated time UUID: %s\n"), str);
} }
memcpy(reply_buf, uu, sizeof(uu)); memcpy(reply_buf, uu, sizeof(uu));
reply_len = sizeof(uu); reply_len = sizeof(uu);
@ -434,7 +435,7 @@ static void server_loop(const char *socket_path, const char *pidfile_path,
__uuid_generate_random(uu, &num); __uuid_generate_random(uu, &num);
if (debug) { if (debug) {
uuid_unparse(uu, str); uuid_unparse(uu, str);
printf(_("Generated random UUID: %s\n"), str); fprintf(stderr, _("Generated random UUID: %s\n"), str);
} }
memcpy(reply_buf, uu, sizeof(uu)); memcpy(reply_buf, uu, sizeof(uu));
reply_len = sizeof(uu); reply_len = sizeof(uu);
@ -443,10 +444,10 @@ static void server_loop(const char *socket_path, const char *pidfile_path,
__uuid_generate_time(uu, &num); __uuid_generate_time(uu, &num);
if (debug) { if (debug) {
uuid_unparse(uu, str); uuid_unparse(uu, str);
printf(P_("Generated time UUID %s " fprintf(stderr, P_("Generated time UUID %s "
"and %d following\n", "and %d following\n",
"Generated time UUID %s " "Generated time UUID %s "
"and %d following\n", num - 1), "and %d following\n", num - 1),
str, num - 1); str, num - 1);
} }
memcpy(reply_buf, uu, sizeof(uu)); memcpy(reply_buf, uu, sizeof(uu));
@ -464,13 +465,13 @@ static void server_loop(const char *socket_path, const char *pidfile_path,
__uuid_generate_random((unsigned char *) reply_buf + __uuid_generate_random((unsigned char *) reply_buf +
sizeof(num), &num); sizeof(num), &num);
if (debug) { if (debug) {
printf(P_("Generated %d UUID:\n", fprintf(stderr, P_("Generated %d UUID:\n",
"Generated %d UUIDs:\n", num), num); "Generated %d UUIDs:\n", num), num);
for (i = 0, cp = reply_buf + sizeof(num); for (i = 0, cp = reply_buf + sizeof(num);
i < num; i < num;
i++, cp += UUID_LEN) { i++, cp += UUID_LEN) {
uuid_unparse((unsigned char *)cp, str); uuid_unparse((unsigned char *)cp, str);
printf("\t%s\n", str); fprintf(stderr, "\t%s\n", str);
} }
} }
reply_len = (num * UUID_LEN) + sizeof(num); reply_len = (num * UUID_LEN) + sizeof(num);
@ -478,7 +479,7 @@ static void server_loop(const char *socket_path, const char *pidfile_path,
break; break;
default: default:
if (debug) if (debug)
printf(_("Invalid operation %d\n"), op); fprintf(stderr, _("Invalid operation %d\n"), op);
goto shutdown_socket; goto shutdown_socket;
} }
write_all(ns, (char *) &reply_len, sizeof(reply_len)); write_all(ns, (char *) &reply_len, sizeof(reply_len));