index 8d6c7836fe565242eb155e8eb598071f6c97471a..bca83a9996a220870fd9651555e1d56bad090397 100644 (file)
--- a/src/utils_cmd_listval.c
+++ b/src/utils_cmd_listval.c
#include "utils_cmd_listval.h"
#include "utils_cache.h"
+#include "utils_parse_option.h"
-int handle_listval (FILE *fh, char **fields, int fields_num)
+#define print_to_socket(fh, ...) \
+ if (fprintf (fh, __VA_ARGS__) < 0) { \
+ char errbuf[1024]; \
+ WARNING ("handle_listval: failed to write to socket #%i: %s", \
+ fileno (fh), sstrerror (errno, errbuf, sizeof (errbuf))); \
+ return -1; \
+ }
+
+int handle_listval (FILE *fh, char *buffer)
{
+ char *command;
char **names = NULL;
time_t *times = NULL;
size_t number = 0;
size_t i;
int status;
- if (fields_num != 1)
+ DEBUG ("utils_cmd_listval: handle_listval (fh = %p, buffer = %s);",
+ (void *) fh, buffer);
+
+ command = NULL;
+ status = parse_string (&buffer, &command);
+ if (status != 0)
+ {
+ print_to_socket (fh, "-1 Cannot parse command.\n");
+ return (-1);
+ }
+ assert (command != NULL);
+
+ if (strcasecmp ("LISTVAL", command) != 0)
+ {
+ print_to_socket (fh, "-1 Unexpected command: `%s'.\n", command);
+ return (-1);
+ }
+
+ if (*buffer != 0)
{
- DEBUG ("command listval: us_handle_listval: Wrong number of fields: %i",
- fields_num);
- fprintf (fh, "-1 Wrong number of fields: Got %i, expected 1.\n",
- fields_num);
- fflush (fh);
+ print_to_socket (fh, "-1 Garbage after end of command: %s\n", buffer);
return (-1);
}
if (status != 0)
{
DEBUG ("command listval: uc_get_names failed with status %i", status);
- fprintf (fh, "-1 uc_get_names failed.\n");
- fflush (fh);
+ print_to_socket (fh, "-1 uc_get_names failed.\n");
return (-1);
}
- fprintf (fh, "%i Value%s found\n", (int) number, (number == 1) ? "" : "s");
+ print_to_socket (fh, "%i Value%s found\n",
+ (int) number, (number == 1) ? "" : "s");
for (i = 0; i < number; i++)
- fprintf (fh, "%u %s\n", (unsigned int) times[i], names[i]);
- fflush (fh);
+ print_to_socket (fh, "%u %s\n", (unsigned int) times[i], names[i]);
return (0);
} /* int handle_listval */