X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=aft.c;h=e0bde7fc78c8365f33aa8e5aae9f751a3dabb751;hb=5f04eea3b1c9a41417ed63e5348b2aabca5542fa;hp=c8c98e7ab679b5a5254eed9405afa3cca6cf870e;hpb=2176cbf10d8f3815f0a17bcc35e4d2e79440d26c;p=paraslash.git

diff --git a/aft.c b/aft.c
index c8c98e7a..e0bde7fc 100644
--- a/aft.c
+++ b/aft.c
@@ -42,7 +42,7 @@ struct ls_data {
  */
 static struct osl_table *audio_file_table; /* NULL if table not open */
 static struct osl_row *current_aft_row; /* NULL if no audio file open */
-static unsigned char current_hash[HASH_SIZE]; /* only used on sighup */
+static unsigned char current_hash[HASH2_SIZE]; /* only used on sighup */
 
 static char *status_items;
 static char *parser_friendly_status_items;
@@ -226,7 +226,7 @@ static struct osl_column_description aft_cols[] = {
 		.storage_flags = OSL_RBTREE | OSL_FIXED_SIZE | OSL_UNIQUE,
 		.name = "hash",
 		.compare_function = aft_hash_compare,
-		.data_size = HASH_SIZE
+		.data_size = HASH2_SIZE
 	},
 	[AFTCOL_PATH] = {
 		.storage_type = OSL_MAPPED_STORAGE,
@@ -251,7 +251,7 @@ static struct osl_column_description aft_cols[] = {
 };
 
 static struct osl_table_description audio_file_table_desc = {
-	.name = "audio_files",
+	.name = "audio-files",
 	.num_columns = NUM_AFT_COLUMNS,
 	.flags = OSL_LARGE_TABLE,
 	.column_descriptions = aft_cols
@@ -442,7 +442,7 @@ int aft_get_row_of_path(const char *path, struct osl_row **row)
  */
 static int aft_get_row_of_hash(unsigned char *hash, struct osl_row **row)
 {
-	const struct osl_object obj = {.data = hash, .size = HASH_SIZE};
+	const struct osl_object obj = {.data = hash, .size = HASH2_SIZE};
 	return osl(osl_get_row(audio_file_table, AFTCOL_HASH, &obj, row));
 }
 
@@ -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)
@@ -838,7 +837,7 @@ static int print_list_item(struct ls_data *d, struct ls_options *opts,
 	char duration_buf[30]; /* nobody has an audio file long enough to overflow this */
 	struct afs_info *afsi = &d->afsi;
 	struct afh_info *afhi = &d->afhi;
-	char asc_hash[2 * HASH_SIZE + 1];
+	char asc_hash[2 * HASH2_SIZE + 1];
 
 	if (opts->mode == LS_MODE_SHORT) {
 		para_printf(b, "%s\n", d->path);
@@ -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))
@@ -1041,7 +1040,7 @@ out:
  */
 int open_and_update_audio_file(int *fd)
 {
-	unsigned char file_hash[HASH_SIZE];
+	unsigned char file_hash[HASH2_SIZE];
 	struct osl_object afsi_obj;
 	struct afs_info new_afsi;
 	int ret;
@@ -1101,7 +1100,7 @@ again:
 	ret = mmap_full_file(d->path, O_RDONLY, &map.data, &map.size, fd);
 	if (ret < 0)
 		goto out;
-	hash_function(map.data, map.size, file_hash);
+	hash2_function(map.data, map.size, file_hash);
 	ret = hash_compare(file_hash, d->hash);
 	para_munmap(map.data, map.size);
 	if (ret) {
@@ -1141,7 +1140,7 @@ out:
 static int ls_hash_compare(const void *a, const void *b)
 {
 	struct ls_data *d1 = *(struct ls_data **)a, *d2 = *(struct ls_data **)b;
-	return memcmp(d1->hash, d2->hash, HASH_SIZE);
+	return memcmp(d1->hash, d2->hash, HASH2_SIZE);
 }
 
 static int ls_audio_format_compare(const void *a, const void *b)
@@ -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;
 		}
 	}
@@ -1536,7 +1535,7 @@ enum com_add_buffer_offsets {
 	/** The hash of the audio file being added. */
 	CAB_HASH_OFFSET = 13,
 	/** Start of the path of the audio file. */
-	CAB_PATH_OFFSET = (CAB_HASH_OFFSET + HASH_SIZE),
+	CAB_PATH_OFFSET = (CAB_HASH_OFFSET + HASH2_SIZE),
 };
 
 /*
@@ -1559,7 +1558,7 @@ static void save_add_callback_buffer(unsigned char *hash, const char *path,
 
 	assert(size <= ~(uint32_t)0);
 	write_u8(buf + CAB_AUDIO_FORMAT_ID_OFFSET, audio_format_num);
-	memcpy(buf + CAB_HASH_OFFSET, hash, HASH_SIZE);
+	memcpy(buf + CAB_HASH_OFFSET, hash, HASH2_SIZE);
 	strcpy(buf + CAB_PATH_OFFSET, path);
 	pos = CAB_PATH_OFFSET + path_len;
 	write_u32(buf + CAB_AFHI_OFFSET_POS, pos);
@@ -1635,7 +1634,7 @@ static int com_add_callback(struct afs_callback_arg *aca)
 	struct osl_row *hs;
 	struct osl_object objs[NUM_AFT_COLUMNS];
 	unsigned char *hash;
-	char asc[2 * HASH_SIZE + 1];
+	char asc[2 * HASH2_SIZE + 1];
 	int ret;
 	char afsi_buf[AFSI_SIZE];
 	char *slpr = buf + read_u32(buf + CAB_LPR_OFFSET);
@@ -1652,7 +1651,7 @@ static int com_add_callback(struct afs_callback_arg *aca)
 	hash = (unsigned char *)buf + CAB_HASH_OFFSET;
 	hash_to_asc(hash, asc);
 	objs[AFTCOL_HASH].data = buf + CAB_HASH_OFFSET;
-	objs[AFTCOL_HASH].size = HASH_SIZE;
+	objs[AFTCOL_HASH].size = HASH2_SIZE;
 
 	path = buf + CAB_PATH_OFFSET;
 	objs[AFTCOL_PATH].data = path;
@@ -1715,7 +1714,7 @@ static int com_add_callback(struct afs_callback_arg *aca)
 	objs[AFTCOL_CHUNKS].data = buf + chunks_offset;
 	objs[AFTCOL_CHUNKS].size = aca->query.size - chunks_offset;
 	if (pb && !hs) { /* update pb's hash */
-		char old_asc[2 * HASH_SIZE + 1];
+		char old_asc[2 * HASH2_SIZE + 1];
 		unsigned char *old_hash;
 		ret = get_hash_of_row(pb, &old_hash);
 		if (ret < 0)
@@ -1820,7 +1819,7 @@ static int add_one_audio_file(const char *path, void *private_data)
 	struct afh_info afhi, *afhi_ptr = NULL;
 	struct osl_row *pb = NULL, *hs = NULL; /* path brother/hash sister */
 	struct osl_object map, obj = {.data = NULL}, query;
-	unsigned char hash[HASH_SIZE];
+	unsigned char hash[HASH2_SIZE];
 	bool a_given = SERVER_CMD_OPT_GIVEN(ADD, ALL, pad->lpr);
 	bool f_given = SERVER_CMD_OPT_GIVEN(ADD, FORCE, pad->lpr);
 	bool l_given = SERVER_CMD_OPT_GIVEN(ADD, LAZY, pad->lpr);
@@ -1848,11 +1847,11 @@ static int add_one_audio_file(const char *path, void *private_data)
 	ret = mmap_full_file(path, O_RDONLY, &map.data, &map.size, &fd);
 	if (ret < 0)
 		goto out_free;
-	hash_function(map.data, map.size, hash);
+	hash2_function(map.data, map.size, hash);
 
 	/* Check whether the database contains a file with the same hash. */
 	query.data = hash;
-	query.size = HASH_SIZE;
+	query.size = HASH2_SIZE;
 	ret = send_callback_request(hash_sister_callback, &query,
 		get_row_pointer_from_result, &hs);
 	if (ret < 0)
@@ -2517,7 +2516,7 @@ static void aft_close(void)
 			PARA_WARNING_LOG("hash lookup failure\n");
 			current_aft_row = NULL;
 		} else
-			memcpy(current_hash, p, HASH_SIZE);
+			memcpy(current_hash, p, HASH2_SIZE);
 	}
 	osl_close_table(audio_file_table, OSL_MARK_CLEAN);
 	audio_file_table = NULL;