Merge branch 't/cpsi_improvement'

Cooking since 2014-05-03.

* t/cpsi_improvement:
  com_cpsi(): Tell the user if nothing was copied.

diff --git a/NEWS b/NEWS
index 7f4149771803cbc180a9f3da13251bd68468d9be..f6fca5662938ecdaaac58b21056760f25712e7d3 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -12,7 +12,8 @@ NEWS
          serious bugs have been fixed.
        - new audiod command: version.
        - Minor improvements to the bitstream API.
-
+       - The cpsi command now prints a meaningful error message if
+         none of the given patterns matched any audio file.
 
 ----------------------------------------
 0.5.2 (2014-04-11) "orthogonal interior"

diff --git a/aft.c b/aft.c
index 179777ba8c8999dc633cf8578f08951ff7dd995c..39f95ad2517b15979a31545e79fae13c7ec33c7e 100644 (file)
--- a/aft.c
+++ b/aft.c
@@ -2409,13 +2409,12 @@ static void com_cpsi_callback(int fd, const struct osl_object *query)
 out:
        if (ret < 0)
                para_printf(&cad.pb, "%s\n", para_strerror(-ret));
-       else if (cad.flags & CPSI_FLAG_VERBOSE) {
-               if (pmd.num_matches > 0)
+       else if (pmd.num_matches > 0) {
+               if (cad.flags & CPSI_FLAG_VERBOSE)
                        para_printf(&cad.pb, "copied requested afsi from %s "
                                "to %u files\n", source_path, pmd.num_matches);
-               else
-                       para_printf(&cad.pb, "nothing copied\n");
-       }
+       } else
+               para_printf(&cad.pb, "no matches - nothing copied\n");
        if (cad.pb.offset)
                pass_buffer_as_shm(fd, SBD_OUTPUT, cad.pb.buf, cad.pb.offset);
        free(cad.pb.buf);