X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aft.c;h=38f47fd804c4d00594c58b8f9104538449f026f6;hp=e8a18fd13cdca7e957dffa34c59b6e7c736fbd22;hb=1709cc8f8a54429441f8f83c38146e667133c727;hpb=f6a845d497ed6883e8318acc8a17d2ed07b85a51

diff --git a/aft.c b/aft.c
index e8a18fd1..38f47fd8 100644
--- a/aft.c
+++ b/aft.c
@@ -11,6 +11,7 @@
 #include <fnmatch.h>
 #include <sys/shm.h>
 #include <osl.h>
+#include <lopsub.h>
 
 #include "para.h"
 #include "error.h"
@@ -1410,10 +1411,14 @@ int com_ls(struct command_context *cc)
 				return -E_AFT_SYNTAX;
 			}
 		}
-		if (!strcmp(arg, "-p")) {
+		if (!strcmp(arg, "-p") || !strcmp(arg, "-F")) {
 			flags |= LS_FLAG_FULL_PATH;
 			continue;
 		}
+		if (!strcmp(arg, "-b")) {
+			flags &= ~LS_FLAG_FULL_PATH;
+			continue;
+		}
 		if (!strcmp(arg, "-a")) {
 			flags |= LS_FLAG_ADMISSIBLE_ONLY;
 			continue;
@@ -2040,6 +2045,22 @@ static int com_touch_callback(struct afs_callback_arg *aca)
 		.data = aca,
 		.action = touch_audio_file
 	};
+	if (cto->image_id >= 0) {
+		ret = img_get_name_by_id(cto->image_id, NULL);
+		if (ret < 0) {
+			para_printf(&aca->pbout, "invalid image ID: %d\n",
+				cto->image_id);
+			return ret;
+		}
+	}
+	if (cto->lyrics_id >= 0) {
+		ret = lyr_get_name_by_id(cto->lyrics_id, NULL);
+		if (ret < 0) {
+			para_printf(&aca->pbout, "invalid lyrics ID: %d\n",
+				cto->lyrics_id);
+			return ret;
+		}
+	}
 	if (cto->flags & TOUCH_FLAG_FNM_PATHNAME)
 		pmd.fnmatch_flags |= FNM_PATHNAME;
 	ret = for_each_matching_row(&pmd);