README,INSTALL: Fix some spelling errors.

[paraslash.git] / afs.c

diff --git a/afs.c b/afs.c
index d5da1e557ee3d2df242ced8fff3c2991e803967c..f40e02244313054ca08f2066e8bb12b488de2579 100644 (file)
--- a/afs.c
+++ b/afs.c
@@ -6,6 +6,7 @@
 
 /** \file afs.c Paraslash's audio file selector. */
 
+#include <fnmatch.h>
 #include "server.cmdline.h"
 #include "para.h"
 #include "afh.h"
@@ -278,6 +279,42 @@ int send_standard_callback_request(int argc,  char * const * const argv,
        return send_option_arg_callback_request(NULL, argc, argv, f, result);
 }
 
+static int action_if_pattern_matches(struct osl_row *row, void *data)
+{
+       struct pattern_match_data *pmd = data;
+       struct osl_object name_obj;
+       const char *p, *name;
+       int ret = osl_get_object(pmd->table, row, pmd->match_col_num, &name_obj);
+       const char *pattern_txt = (const char *)pmd->patterns.data;
+
+       if (ret < 0)
+               return ret;
+       name = (char *)name_obj.data;
+       if ((!name || !*name) && (pmd->pm_flags & PM_SKIP_EMPTY_NAME))
+               return 1;
+       if (!pmd->patterns.size && (pmd->pm_flags & PM_NO_PATTERN_MATCHES_EVERYTHING))
+               return pmd->action(pmd->table, row, name, pmd->data);
+       for (p = pattern_txt; p < pattern_txt + pmd->patterns.size;
+                       p += strlen(p) + 1) {
+               ret = fnmatch(p, name, pmd->fnmatch_flags);
+               if (ret == FNM_NOMATCH)
+                       continue;
+               if (ret)
+                       return -E_FNMATCH;
+               return pmd->action(pmd->table, row, name, pmd->data);
+       }
+       return 1;
+}
+
+int for_each_matching_row(struct pattern_match_data *pmd)
+{
+       if (pmd->pm_flags & PM_REVERSE_LOOP)
+               return osl_rbtree_loop_reverse(pmd->table, pmd->loop_col_num, pmd,
+                       action_if_pattern_matches);
+       return osl_rbtree_loop(pmd->table, pmd->loop_col_num, pmd,
+                       action_if_pattern_matches);
+}
+
 /**
  * Compare two osl objects of string type.
  *
@@ -300,40 +337,6 @@ int string_compare(const struct osl_object *obj1, const struct osl_object *obj2)
        return strncmp(str1, str2, PARA_MIN(obj1->size, obj2->size));
 }
 
-/**
- * A wrapper for strtol(3).
- *
- * \param str The string to be converted to a long integer.
- * \param result The converted value is stored here.
- *
- * \return Positive on success, -E_ATOL on errors.
- *
- * \sa strtol(3), atoi(3).
- */
-int para_atol(const char *str, long *result)
-{
-       char *endptr;
-       long val;
-       int ret, base = 10;
-
-       errno = 0; /* To distinguish success/failure after call */
-       val = strtol(str, &endptr, base);
-       ret = -E_ATOL;
-       if (errno == ERANGE && (val == LONG_MAX || val == LONG_MIN))
-               goto out; /* overflow */
-       if (errno != 0 && val == 0)
-               goto out; /* other error */
-       if (endptr == str)
-               goto out; /* No digits were found */
-       if (*endptr != '\0')
-               goto out; /* Further characters after number */
-       *result = val;
-       ret = 1;
-out:
-       return ret;
-}
-
-
 /*
  * write input from fd to dynamically allocated buffer,
  * but maximal max_size byte.
@@ -919,5 +922,16 @@ int com_check(int fd, int argc, char * const * const argv)
                                return ret;
                }
        }
+       if (flags & CHECK_MOODS) {
+               ret = send_callback_request(mood_check_callback, NULL, &result);
+               if (ret < 0)
+                       return ret;
+               if (ret > 0) {
+                       ret = send_buffer(fd, (char *) result.data);
+                       free(result.data);
+                       if (ret < 0)
+                               return ret;
+               }
+       }
        return 1;
 }