manual: Fix paragraph on addblob commands.

[paraslash.git] / aft.c

diff --git a/aft.c b/aft.c
index 59be56eb68cd274debfe5077c5031687121fc7fa..acf751566c61d82e23cc34565c1189f2db147917 100644 (file)
--- a/aft.c
+++ b/aft.c
@@ -293,60 +293,36 @@ static struct osl_table_description audio_file_table_desc = {
        .column_descriptions = aft_cols
 };
 
-/* We don't want dot or dot-dot anywhere. */
-static int verify_dotfile(const char *rest)
-{
-       /*
-        * The first character was '.', but that has already been discarded, we
-        * now test the rest.
-        */
-       switch (*rest) {
-       case '\0': case '/': /* /foo/. and /foo/./bar are not ok */
-               return -1;
-       case '.': /* path start with /foo/.. */
-               if (rest[1] == '\0' || rest[1] == '/')
-                       return -1; /* /foo/.. or /foo/../bar are not ok */
-               /* /foo/..bar is ok */
-       }
-       return 1;
-}
-
 /*
- * We fundamentally don't like some paths: We don't want double slashes or
- * slashes at the end that can make pathnames ambiguous.
+ * Produce a canonicalized absolute pathname.
+ *
+ * Returns one if the resolved path a directory, zero if it is a regular file,
+ * negative on errors.
  */
 static int verify_path(const char *orig_path, char **resolved_path)
 {
-       char c;
-       size_t len;
-       char *path;
+       int ret;
+       char *path = NULL;
+       struct stat statbuf;
 
        if (*orig_path != '/') /* we only accept absolute paths */
-               return -E_BAD_PATH;
-       len = strlen(orig_path);
-       *resolved_path = para_strdup(orig_path);
-       path = *resolved_path;
-       while (len > 1 && path[--len] == '/')
-               path[len] = '\0'; /* remove slash at the end */
-       c = *path++;
-       while (c) {
-               if (c == '/') {
-                       c = *path++;
-                       switch (c) {
-                       case '/': /* double slash */
-                               goto bad_path;
-                       case '.':
-                               if (verify_dotfile(path) < 0)
-                                       goto bad_path;
-                       default:
-                               continue;
-                       }
-               }
-               c = *path++;
-       }
-       return 1;
-bad_path:
-       free(*resolved_path);
+               goto fail;
+       path = realpath(orig_path, NULL);
+       if (!path)
+               goto fail;
+       if (stat(path, &statbuf) < 0)
+               goto fail;
+       if (S_ISREG(statbuf.st_mode))
+               ret = 0;
+       else if (S_ISDIR(statbuf.st_mode))
+               ret = 1;
+       else
+               goto fail;
+       *resolved_path = path;
+       return ret;
+fail:
+       *resolved_path = NULL;
+       free(path);
        return -E_BAD_PATH;
 }
 
@@ -693,16 +669,13 @@ err:
 int load_afd(int shmid, struct audio_file_data *afd)
 {
        void *shm_afd;
-       char *buf;
        int ret;
 
        ret = shm_attach(shmid, ATTACH_RO, &shm_afd);
        if (ret < 0)
                return ret;
        *afd = *(struct audio_file_data *)shm_afd;
-       buf = shm_afd;
-       buf += sizeof(*afd);
-       load_chunk_table(&afd->afhi, buf);
+       load_chunk_table(&afd->afhi, shm_afd + sizeof(*afd));
        shm_detach(shm_afd);
        return 1;
 }
@@ -1145,13 +1118,13 @@ again:
                return ret;
        ret = mmap_full_file(d->path, O_RDONLY, &map.data, &map.size, &afd->fd);
        if (ret < 0)
-               goto err;
+               goto out;
        hash_function(map.data, map.size, file_hash);
        ret = hash_compare(file_hash, d->hash);
        para_munmap(map.data, map.size);
        if (ret) {
                ret = -E_HASH_MISMATCH;
-               goto err;
+               goto out;
        }
        new_afsi = d->afsi;
        new_afsi.num_played++;
@@ -1168,7 +1141,7 @@ again:
         */
        afs_event(AFSI_CHANGE, NULL, &aced);
        ret = save_afd(afd);
-err:
+out:
        free(afd->afhi.chunk_table);
        osl_close_disk_object(&chunk_table_obj);
        if (ret < 0) {
@@ -1981,7 +1954,6 @@ int com_add(struct command_context *cc)
 {
        int i, ret;
        struct private_add_data pad = {.cc = cc, .flags = 0};
-       struct stat statbuf;
 
        for (i = 1; i < cc->argc; i++) {
                const char *arg = cc->argv[i];
@@ -2020,20 +1992,10 @@ int com_add(struct command_context *cc)
                                return ret;
                        continue;
                }
-               ret = stat(path, &statbuf);
-               if (ret < 0) {
-                       ret = send_sb_va(&cc->scc, SBD_ERROR_LOG,
-                               "failed to stat %s (%s)\n", path,
-                               strerror(errno));
-                       free(path);
-                       if (ret < 0)
-                               return ret;
-                       continue;
-               }
-               if (S_ISDIR(statbuf.st_mode))
+               if (ret == 1) /* directory */
                        ret = for_each_file_in_dir(path, add_one_audio_file,
                                &pad);
-               else
+               else /* regular file */
                        ret = add_one_audio_file(path, &pad);
                if (ret < 0) {
                        send_sb_va(&cc->scc, SBD_OUTPUT, "%s: %s\n", path,
@@ -2138,7 +2100,10 @@ static void com_touch_callback(int fd, const struct osl_object *query)
        struct touch_action_data tad = {.cto = query->data,
                .pb = {
                        .max_size = shm_get_shmmax(),
-                       .private_data = &fd,
+                       .private_data = &(struct afs_max_size_handler_data) {
+                               .fd = fd,
+                               .band = SBD_OUTPUT
+                       },
                        .max_size_handler = afs_max_size_handler
                }
        };
@@ -2279,7 +2244,10 @@ static void com_rm_callback(int fd, const struct osl_object *query)
        struct com_rm_action_data crd = {.flags = *(uint32_t *)query->data,
                .pb = {
                        .max_size = shm_get_shmmax(),
-                       .private_data = &fd,
+                       .private_data = &(struct afs_max_size_handler_data) {
+                               .fd = fd,
+                               .band = SBD_OUTPUT
+                       },
                        .max_size_handler = afs_max_size_handler
                }
        };
@@ -2421,7 +2389,10 @@ static void com_cpsi_callback(int fd, const struct osl_object *query)
                .flags = *(unsigned *)query->data,
                .pb = {
                        .max_size = shm_get_shmmax(),
-                       .private_data = &fd,
+                       .private_data = &(struct afs_max_size_handler_data) {
+                               .fd = fd,
+                               .band = SBD_OUTPUT
+                       },
                        .max_size_handler = afs_max_size_handler
                }
        };