X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=aft.c;h=f2c1edab75c49125b6939c031e24ad28cf0e74cf;hb=6fc2a2c87ba41ed207aa36e9818819cf28c70db1;hp=bf86acf80ca32a601a2e68cfd7b7a691ac3ba92a;hpb=c74ba0f43d51d561e94ebe6ae171d65e3a9b42d1;p=paraslash.git

diff --git a/aft.c b/aft.c
index bf86acf8..f2c1edab 100644
--- a/aft.c
+++ b/aft.c
@@ -241,19 +241,12 @@ enum audio_file_table_columns {
 	NUM_AFT_COLUMNS
 };
 
-/**
- * Compare two osl objects pointing to hash values.
- *
- * \param obj1 Pointer to the first hash object.
- * \param obj2 Pointer to the second hash object.
- *
- * \return The values required for an osl compare function.
- *
- * \sa osl_compare_func, uint32_compare().
- */
-static int aft_hash_compare(const struct osl_object *obj1, const struct osl_object *obj2)
+/* compare function for the hash column */
+static int aft_hash_compare(const struct osl_object *obj1,
+		const struct osl_object *obj2)
 {
-	return hash_compare((unsigned char *)obj1->data, (unsigned char *)obj2->data);
+	return hash_compare((unsigned char *)obj1->data,
+		(unsigned char *)obj2->data);
 }
 
 static struct osl_column_description aft_cols[] = {
@@ -1439,18 +1432,26 @@ int com_ls(struct command_context *cc)
 			i++;
 			break;
 		}
+		/*
+		 * Compatibility: Prior to 0.5.5 it was necessary to specify
+		 * the listing mode without the '=' character as in -lv, for
+		 * example. Now the variant with '=' is preferred and
+		 * documented but we still accept the old way to specify the
+		 * listing mode.
+		 *
+		 * Support for the legacy syntax can be dropped at 0.6.0
+		 * or later.
+		 */
 		if (!strncmp(arg, "-l", 2)) {
-			if (!*(arg + 2)) {
-				mode = LS_MODE_LONG;
-				continue;
-			}
-			if (*(arg + 3))
-				return -E_AFT_SYNTAX;
-			switch(*(arg + 2)) {
+			arg += 2;
+			if (*arg == '=')
+				arg++;
+			switch (*arg) {
 			case 's':
 				mode = LS_MODE_SHORT;
 				continue;
 			case 'l':
+			case '\0':
 				mode = LS_MODE_LONG;
 				continue;
 			case 'v':
@@ -1485,10 +1486,12 @@ int com_ls(struct command_context *cc)
 			flags |= LS_FLAG_UNIXDATE;
 			continue;
 		}
+		/* The compatibility remark above applies also to -s. */
 		if (!strncmp(arg, "-s", 2)) {
-			if (!*(arg + 2) || *(arg + 3))
-				return -E_AFT_SYNTAX;
-			switch(*(arg + 2)) {
+			arg += 2;
+			if (*arg == '=')
+				arg++;
+			switch (*arg) {
 			case 'p':
 				sort = LS_SORT_BY_PATH;
 				continue;