X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=aft.c;h=1f1e1198d50c66c7723d22453f8d3b848cc7b2b7;hb=5ae1a5bb9732d777f856d5bb003585f81e3c519a;hp=35a53904a33a85ba484830bc43cf46ec1ae1bd98;hpb=2bad70d84e763b4d866d7b97dbc1cdc8e030bd45;p=paraslash.git

diff --git a/aft.c b/aft.c
index 35a53904..1f1e1198 100644
--- a/aft.c
+++ b/aft.c
@@ -412,7 +412,7 @@ static void load_chunk_table(struct afh_info *afhi, const struct osl_object *ct)
 		return;
 	}
 	sz  = PARA_MIN(((size_t)afhi->chunks_total + 1) * 4, ct->size) + 1;
-	afhi->chunk_table = para_malloc(sz);
+	afhi->chunk_table = alloc(sz);
 	for (i = 0; i <= afhi->chunks_total && i * 4 + 3 < ct->size; i++)
 		afhi->chunk_table[i] = read_u32(ct->data + 4 * i);
 }
@@ -779,18 +779,17 @@ static void write_image_items(struct para_buffer *b, struct afs_info *afsi)
 static void write_filename_items(struct para_buffer *b, const char *path,
 		bool basename)
 {
-	char *val;
+	const char *slash;
 
 	if (basename) {
 		WRITE_STATUS_ITEM(b, SI_basename, "%s\n", path);
 		return;
 	}
 	WRITE_STATUS_ITEM(b, SI_path, "%s\n", path);
-	val = para_basename(path);
-	WRITE_STATUS_ITEM(b, SI_basename, "%s\n", val? val : "");
-	val = para_dirname(path);
-	WRITE_STATUS_ITEM(b, SI_directory, "%s\n", val? val : "");
-	free(val);
+	slash = strrchr(path, '/');
+	WRITE_STATUS_ITEM(b, SI_basename, "%s\n", slash? slash + 1 : path);
+	WRITE_STATUS_ITEM(b, SI_directory, "%.*s\n",
+		slash? (int)(slash - path) : (int)strlen(path), path);
 }
 
 static int print_chunk_table(struct ls_data *d, struct para_buffer *b)
@@ -897,13 +896,13 @@ static int print_list_item(struct ls_data *d, struct ls_options *opts,
 		goto out;
 	}
 	if (opts->mode == LS_MODE_MBOX) {
-		const char *bn = para_basename(d->path);
+		const char *slash = strrchr(d->path, '/');
 		para_printf(b,
 			"From foo@localhost %s\n"
 			"Received: from\nTo: bar\nFrom: a\n"
 			"Subject: %s\n\n",
 			last_played_time,
-			bn? bn : "?");
+			slash? slash + 1 : "?");
 	}
 	write_filename_items(b, d->path, lls_opt_given(r_b));
 	if (lls_opt_given(r_a))
@@ -1067,7 +1066,7 @@ again:
 	if (ret < 0)
 		return ret;
 	if (!d->hash)
-		d->hash = para_malloc(HASH_SIZE);
+		d->hash = alloc(HASH_SIZE);
 	memcpy(d->hash, tmp_hash, HASH_SIZE);
 	free(d->path);
 	ret = get_audio_file_path_of_row(current_aft_row, &d->path);
@@ -1225,7 +1224,7 @@ static int sort_matching_paths(struct ls_options *options)
 	int (*compar)(const void *, const void *);
 	int i;
 
-	options->data_ptr = para_malloc(nmemb * sizeof(*options->data_ptr));
+	options->data_ptr = arr_alloc(nmemb, sizeof(*options->data_ptr));
 	for (i = 0; i < nmemb; i++)
 		options->data_ptr[i] = options->data + i;
 
@@ -1318,8 +1317,8 @@ static int prepare_ls_row(struct osl_row *row, void *ls_opts)
 	if (options->num_matching_paths > options->array_size) {
 		options->array_size++;
 		options->array_size *= 2;
-		options->data = para_realloc(options->data, options->array_size
-			* sizeof(*options->data));
+		options->data = arr_realloc(options->data, options->array_size,
+			sizeof(*options->data));
 	}
 	d = options->data + tmp;
 	ret = get_afsi_of_row(aft_row, &d->afsi);
@@ -1376,7 +1375,7 @@ static int com_ls_callback(struct afs_callback_arg *aca)
 
 	aca->pbout.flags = (opts->mode == LS_MODE_PARSER)? PBF_SIZE_PREFIX : 0;
 	if (admissible_only(opts))
-		ret = admissible_file_loop(opts, prepare_ls_row);
+		ret = score_loop(prepare_ls_row, opts);
 	else
 		ret = osl(osl_rbtree_loop(audio_file_table, AFTCOL_PATH, opts,
 			prepare_ls_row));
@@ -1425,7 +1424,7 @@ static int com_ls(struct command_context *cc, struct lls_parse_result *lpr)
 	ret = lls_serialize_parse_result(lpr, cmd, NULL, &query.size);
 	assert(ret >= 0);
 	query.size += sizeof(*opts);
-	query.data = para_malloc(query.size);
+	query.data = alloc(query.size);
 	opts = query.data;
 	memset(opts, 0, sizeof(*opts));
 	slpr = query.data + sizeof(*opts);
@@ -1448,7 +1447,7 @@ static int com_ls(struct command_context *cc, struct lls_parse_result *lpr)
 		else if (!strcmp(val, "p") || !strcmp(val, "parser-friendly"))
 			opts->mode = LS_MODE_PARSER;
 		else {
-			ret = -E_AFT_SYNTAX;
+			ret = -ERRNO_TO_PARA_ERROR(EINVAL);
 			goto out;
 		}
 	}
@@ -1479,7 +1478,7 @@ static int com_ls(struct command_context *cc, struct lls_parse_result *lpr)
 		else if (!strcmp(val, "h") || !strcmp(val, "hash"))
 			opts->sorting = LS_SORT_BY_HASH;
 		else {
-			ret = -E_AFT_SYNTAX;
+			ret = -ERRNO_TO_PARA_ERROR(EINVAL);
 			goto out;
 		}
 	}
@@ -1554,7 +1553,7 @@ static void save_add_callback_buffer(unsigned char *hash, const char *path,
 	size_t afhi_size = sizeof_afhi_buf(afhi);
 	size_t size = CAB_PATH_OFFSET + path_len + afhi_size
 		+ sizeof_chunk_table(afhi) + slpr_size;
-	char *buf = para_malloc(size);
+	char *buf = alloc(size);
 	uint32_t pos;
 
 	assert(size <= ~(uint32_t)0);
@@ -2321,7 +2320,7 @@ static int com_setatt_callback(struct afs_callback_arg *aca)
 				goto out; /* no attribute modifier given */
 			goto set_atts;
 		}
-		p = para_malloc(len);
+		p = alloc(len);
 		memcpy(p, arg, len - 1);
 		p[len - 1] = '\0';
 		ret = get_attribute_bitnum_by_name(p, &bitnum);