Fix an off-by-one bug.

[paraslash.git] / stat.c

diff --git a/stat.c b/stat.c
index e881ae09fed1f0d77983cb6eb6081598f3fc3f90..eefac72c02fe343a1e0d4d19aed7f84387cb8269 100644 (file)
--- a/stat.c
+++ b/stat.c
@@ -1,25 +1,18 @@
 /*
  * Copyright (C) 2005-2007 Andre Noll <maan@systemlinux.org>
  *
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /**
  *  \file stat.c functions used for sending/receiving the status of para_server
  *  and para_audiod
  */
+
+
+#include <sys/types.h>
+#include <dirent.h>
+
 #include "para.h"
 #include "close_on_fork.h"
 #include "list.h"
@@ -51,11 +44,9 @@ static struct list_head client_list;
 static int initialized;
 static int num_clients;
 
-/**
- * the list of all status items sent by para_server/para_audiod
- */
+/** The list of all status items used by para_server/para_audiod. */
 const char *status_item_list[NUM_STAT_ITEMS] = {
-       [SI_STATUS_BAR] = "status_bar",
+       [SI_BASENAME] = "basename",
        [SI_STATUS] = "status",
        [SI_NUM_PLAYED] = "num_played",
 
@@ -72,10 +63,10 @@ const char *status_item_list[NUM_STAT_ITEMS] = {
        [SI_AUDIO_INFO2] = "audio_file_info2",
 
        [SI_AUDIO_INFO3] = "audio_file_info3",
-       [SI_DBINFO1] = "dbinfo1",
-       [SI_DBINFO2] = "dbinfo2",
+       [SI_AFS_MODE] = "afs_mode",
+       [SI_ATTRIBUTES] = "attributes",
 
-       [SI_DBINFO3] = "dbinfo3",
+       [SI_DIRECTORY] = "dir",
        [SI_DECODER_FLAGS] = "decoder_flags",
        [SI_AUDIOD_STATUS] = "audiod_status",
 
@@ -88,7 +79,8 @@ const char *status_item_list[NUM_STAT_ITEMS] = {
        [SI_CURRENT_TIME] = "current_time",
 
        [SI_AUDIOD_UPTIME] = "audiod_uptime",
-       [SI_SELECTOR] = "dbtool"
+       [SI_IMAGE_ID] = "image_id",
+       [SI_LYRICS_ID] = "lyrics_id"
 };
 
 static void dump_stat_client_list(void)
@@ -178,7 +170,6 @@ void stat_client_write(const char *msg, int itemnum)
        PARA_DEBUG_LOG("%d client(s)\n", num_clients);
 }
 
-
 /**
  * check if string is a known status item.
  *
@@ -191,12 +182,13 @@ int stat_item_valid(const char *item)
 {
        int i;
        if (!item || !*item) {
-       PARA_ERROR_LOG("%s\n", "no item");
+               PARA_ERROR_LOG("%s\n", "no item");
                return -E_UNKNOWN_STAT_ITEM;
        }
        FOR_EACH_STAT_ITEM(i)
                if (!strcmp(status_item_list[i], item))
                        return i;
+       PARA_ERROR_LOG("invalid stat item: %s\n", item);
        return -E_UNKNOWN_STAT_ITEM;
 }
 
@@ -228,54 +220,3 @@ int stat_line_valid(const char *line)
        return -E_UNKNOWN_STAT_ITEM;
 }
 
-/**
- * call a custom function for each complete line
- *
- * \param buf the buffer containing data seperated by newlines
- * \param n the number of bytes in \a buf
- * \param line_handler the custom function
- *
- * If \a line_handler is \p NULL, return number of complete lines in buf.
- * Otherwise, call \a line_handler for each complete line.  The rest of the
- * buffer (last chunk containing incomplete line is moved to the beginning of
- * the buffer.
- *
- * \return If line_handler is not NULL, this function returns the number
- * of bytes not handled to \a line_handler.
- */
-size_t for_each_line(char *buf, size_t n, void (*line_handler)(char *))
-{
-       char *start = buf, *end;
-       size_t num_lines = 0, bytes_left = n;
-
-//     PARA_INFO_LOG("buf: %s", buf);
-       while (bytes_left) {
-               char *next_null;
-               char *next_cr;
-
-               next_cr = memchr(start, '\n', bytes_left);
-               next_null = memchr(start, '\0', bytes_left);
-               if (!next_cr && !next_null)
-                       break;
-               if (next_cr && next_null) {
-                       end = next_cr < next_null? next_cr : next_null;
-               } else if (next_null) {
-                       end = next_null;
-               } else
-                       end = next_cr;
-               num_lines++;
-               if (line_handler) {
-                       *end = '\0';
-//                     PARA_INFO_LOG("calling line handler: %s\n", start);
-                       line_handler(start);
-               }
-               start = ++end;
-               bytes_left = buf + n - start;
-       }
-       if (!line_handler)
-               return num_lines;
-       if (bytes_left && bytes_left != n)
-               memmove(buf, start, bytes_left);
-       return bytes_left;
-}
-