X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aft.c;h=220e019e7f0bbc0553fcb72e12193d8ca9c3f98d;hp=5ad5d8f06583bea878c6d29b9f1158d19062f741;hb=57e0c93e87138fdf1c8793c3d1f3d2880d717548;hpb=337d7784b0f8bc30b1fa9af56ace503acd97d40d

diff --git a/aft.c b/aft.c
index 5ad5d8f0..220e019e 100644
--- a/aft.c
+++ b/aft.c
@@ -6,15 +6,18 @@
 
 /** \file aft.c Audio file table functions. */
 
+#include <regex.h>
 #include <dirent.h> /* readdir() */
-#include <osl.h>
-#include "para.h"
-#include "error.h"
-#include "string.h"
+#include <openssl/rc4.h>
 #include <sys/mman.h>
 #include <fnmatch.h>
 #include <sys/shm.h>
+#include <osl.h>
 
+#include "para.h"
+#include "error.h"
+#include "crypt.h"
+#include "string.h"
 #include "afh.h"
 #include "afs.h"
 #include "net.h"
@@ -79,6 +82,8 @@ enum ls_flags {
 	LS_FLAG_ADMISSIBLE_ONLY = 2,
 	/** -r */
 	LS_FLAG_REVERSE = 4,
+	/** -d */
+	LS_FLAG_UNIXDATE = 8,
 };
 
 /**
@@ -853,10 +858,15 @@ static int print_list_item(struct ls_data *d, struct ls_options *opts,
 		goto out;
 	}
 	get_attribute_bitmap(&afsi->attributes, att_buf);
-	ret = get_local_time(&afsi->last_played, last_played_time,
-		sizeof(last_played_time), current_time, opts->mode);
-	if (ret < 0)
-		goto out;
+	if (opts->flags & LS_FLAG_UNIXDATE)
+		sprintf(last_played_time, "%llu",
+			(long long unsigned)afsi->last_played);
+	else {
+		ret = get_local_time(&afsi->last_played, last_played_time,
+			sizeof(last_played_time), current_time, opts->mode);
+		if (ret < 0)
+			goto out;
+	}
 	get_duration_buf(afhi->seconds_total, duration_buf, opts);
 	if (opts->mode == LS_MODE_LONG) {
 		struct ls_widths *w = &opts->widths;
@@ -1360,7 +1370,7 @@ out:
 /*
  * TODO: flags -h (sort by hash)
  */
-int com_ls(int fd, int argc, char * const * const argv)
+int com_ls(struct rc4_context *rc4c, int argc, char * const * const argv)
 {
 	int i, ret;
 	unsigned flags = 0;
@@ -1419,6 +1429,10 @@ int com_ls(int fd, int argc, char * const * const argv)
 			flags |= LS_FLAG_REVERSE;
 			continue;
 		}
+		if (!strcmp(arg, "-d")) {
+			flags |= LS_FLAG_UNIXDATE;
+			continue;
+		}
 		if (!strncmp(arg, "-s", 2)) {
 			if (!*(arg + 2) || *(arg + 3))
 				return -E_AFT_SYNTAX;
@@ -1468,7 +1482,7 @@ int com_ls(int fd, int argc, char * const * const argv)
 	opts.mode = mode;
 	opts.num_patterns = argc - i;
 	ret = send_option_arg_callback_request(&query, opts.num_patterns,
-		argv + i, com_ls_callback, send_result, &fd);
+		argv + i, com_ls_callback, rc4_send_result, rc4c);
 	return ret;
 }
 
@@ -1755,8 +1769,8 @@ out:
 
 /** Used by com_add(). */
 struct private_add_data {
-	/** The socket file descriptor. */
-	int fd;
+	/** The socket file descriptor, including rc4 keys. */
+	struct rc4_context *rc4c;
 	/** The given add flags. */
 	uint32_t flags;
 };
@@ -1811,7 +1825,8 @@ static int add_one_audio_file(const char *path, void *private_data)
 	ret = 1;
 	if (pb && (pad->flags & ADD_FLAG_LAZY)) { /* lazy is really cheap */
 		if (pad->flags & ADD_FLAG_VERBOSE)
-			send_ret = send_va_buffer(pad->fd, "lazy-ignore: %s\n", path);
+			send_ret = rc4_send_va_buffer(pad->rc4c,
+				"lazy-ignore: %s\n", path);
 		goto out_free;
 	}
 	/* We still want to add this file. Compute its hash. */
@@ -1831,7 +1846,7 @@ static int add_one_audio_file(const char *path, void *private_data)
 	ret = 1;
 	if (pb && hs && hs == pb && !(pad->flags & ADD_FLAG_FORCE)) {
 		if (pad->flags & ADD_FLAG_VERBOSE)
-			send_ret = send_va_buffer(pad->fd,
+			send_ret = rc4_send_va_buffer(pad->rc4c,
 				"%s exists, not forcing update\n", path);
 		goto out_unmap;
 	}
@@ -1849,13 +1864,13 @@ static int add_one_audio_file(const char *path, void *private_data)
 	munmap(map.data, map.size);
 	close(fd);
 	if (pad->flags & ADD_FLAG_VERBOSE) {
-		send_ret = send_va_buffer(pad->fd, "adding %s\n", path);
+		send_ret = rc4_send_va_buffer(pad->rc4c, "adding %s\n", path);
 		if (send_ret < 0)
 			goto out_free;
 	}
 	save_add_callback_buffer(hash, path, afhi_ptr, pad->flags, format_num, &obj);
 	/* Ask afs to consider this entry for adding. */
-	ret = send_callback_request(com_add_callback, &obj, send_result, &pad->fd);
+	ret = send_callback_request(com_add_callback, &obj, rc4_send_result, pad->rc4c);
 	goto out_free;
 
 out_unmap:
@@ -1863,8 +1878,8 @@ out_unmap:
 	munmap(map.data, map.size);
 out_free:
 	if (ret < 0 && send_ret >= 0)
-		send_ret = send_va_buffer(pad->fd, "failed to add %s (%s)\n", path,
-			para_strerror(-ret));
+		send_ret = rc4_send_va_buffer(pad->rc4c,
+			"failed to add %s (%s)\n", path, para_strerror(-ret));
 	free(obj.data);
 	if (afhi_ptr) {
 		free(afhi_ptr->chunk_table);
@@ -1879,10 +1894,10 @@ out_free:
 	return send_ret;
 }
 
-int com_add(int fd, int argc, char * const * const argv)
+int com_add(struct rc4_context *rc4c, int argc, char * const * const argv)
 {
 	int i, ret;
-	struct private_add_data pad = {.fd = fd, .flags = 0};
+	struct private_add_data pad = {.rc4c = rc4c, .flags = 0};
 	struct stat statbuf;
 
 	for (i = 1; i < argc; i++) {
@@ -1916,7 +1931,7 @@ int com_add(int fd, int argc, char * const * const argv)
 		char *path;
 		ret = verify_path(argv[i], &path);
 		if (ret < 0) {
-			ret = send_va_buffer(fd, "%s: %s\n", argv[i],
+			ret = rc4_send_va_buffer(rc4c, "%s: %s\n", argv[i],
 				para_strerror(-ret));
 			if (ret < 0)
 				return ret;
@@ -1924,7 +1939,7 @@ int com_add(int fd, int argc, char * const * const argv)
 		}
 		ret = stat(path, &statbuf);
 		if (ret < 0) {
-			ret = send_va_buffer(fd, "failed to stat %s (%s)\n", path,
+			ret = rc4_send_va_buffer(rc4c, "failed to stat %s (%s)\n", path,
 				strerror(errno));
 			free(path);
 			if (ret < 0)
@@ -1937,7 +1952,7 @@ int com_add(int fd, int argc, char * const * const argv)
 		else
 			ret = add_one_audio_file(path, &pad);
 		if (ret < 0) {
-			send_va_buffer(fd, "%s: %s\n", path, para_strerror(-ret));
+			rc4_send_va_buffer(rc4c, "%s: %s\n", path, para_strerror(-ret));
 			free(path);
 			return ret;
 		}
@@ -2069,7 +2084,7 @@ static void com_touch_callback(int fd, const struct osl_object *query)
 	free(tad.pb.buf);
 }
 
-int com_touch(int fd, int argc, char * const * const argv)
+int com_touch(struct rc4_context *rc4c, int argc, char * const * const argv)
 {
 	struct com_touch_options cto = {
 		.num_played = -1,
@@ -2090,33 +2105,33 @@ int com_touch(int fd, int argc, char * const * const argv)
 			i++;
 			break;
 		}
-		if (!strncmp(arg, "-n", 2)) {
-			ret = para_atoi32(arg + 2, &cto.num_played);
+		if (!strncmp(arg, "-n=", 3)) {
+			ret = para_atoi32(arg + 3, &cto.num_played);
 			if (ret < 0)
 				return ret;
 			continue;
 		}
-		if (!strncmp(arg, "-l", 2)) {
-			ret = para_atoi64(arg + 2, &cto.last_played);
+		if (!strncmp(arg, "-l=", 3)) {
+			ret = para_atoi64(arg + 3, &cto.last_played);
 			if (ret < 0)
 				return ret;
 			continue;
 		}
-		if (!strncmp(arg, "-y", 2)) {
-			ret = para_atoi32(arg + 2, &cto.lyrics_id);
+		if (!strncmp(arg, "-y=", 3)) {
+			ret = para_atoi32(arg + 3, &cto.lyrics_id);
 			if (ret < 0)
 				return ret;
 			continue;
 		}
-		if (!strncmp(arg, "-i", 2)) {
-			ret = para_atoi32(arg + 2, &cto.image_id);
+		if (!strncmp(arg, "-i=", 3)) {
+			ret = para_atoi32(arg + 3, &cto.image_id);
 			if (ret < 0)
 				return ret;
 			continue;
 		}
-		if (!strncmp(arg, "-a", 2)) {
+		if (!strncmp(arg, "-a=", 3)) {
 			int32_t val;
-			ret = para_atoi32(arg + 2, &val);
+			ret = para_atoi32(arg + 3, &val);
 			if (ret < 0)
 				return ret;
 			if (val < 0 || val > 255)
@@ -2137,9 +2152,9 @@ int com_touch(int fd, int argc, char * const * const argv)
 	if (i >= argc)
 		return -E_AFT_SYNTAX;
 	ret = send_option_arg_callback_request(&query, argc - i,
-		argv + i, com_touch_callback, send_result, &fd);
+		argv + i, com_touch_callback, rc4_send_result, rc4c);
 	if (ret < 0)
-		send_va_buffer(fd, "%s\n", para_strerror(-ret));
+		rc4_send_va_buffer(rc4c, "%s\n", para_strerror(-ret));
 	return ret;
 }
 
@@ -2221,7 +2236,7 @@ static void com_rm_callback(int fd, const struct osl_object *query)
 }
 
 /* TODO options: -r (recursive) */
-int com_rm(int fd, int argc,  char * const * const argv)
+int com_rm(struct rc4_context *rc4c, int argc,  char * const * const argv)
 {
 	uint32_t flags = 0;
 	struct osl_object query = {.data = &flags, .size = sizeof(flags)};
@@ -2252,9 +2267,9 @@ int com_rm(int fd, int argc,  char * const * const argv)
 	if (i >= argc)
 		return -E_AFT_SYNTAX;
 	ret = send_option_arg_callback_request(&query, argc - i, argv + i,
-		com_rm_callback, send_result, &fd);
+		com_rm_callback, rc4_send_result, rc4c);
 	if (ret < 0)
-		send_va_buffer(fd, "%s\n", para_strerror(-ret));
+		rc4_send_va_buffer(rc4c, "%s\n", para_strerror(-ret));
 	return ret;
 }
 
@@ -2369,7 +2384,7 @@ out:
 	free(cad.pb.buf);
 }
 
-int com_cpsi(int fd, int argc,  char * const * const argv)
+int com_cpsi(struct rc4_context *rc4c, int argc,  char * const * const argv)
 {
 	unsigned flags = 0;
 	int i, ret;
@@ -2414,9 +2429,9 @@ int com_cpsi(int fd, int argc,  char * const * const argv)
 	if (!(flags & ~CPSI_FLAG_VERBOSE)) /* no copy flags given */
 		flags = ~(unsigned)CPSI_FLAG_VERBOSE | flags;
 	ret = send_option_arg_callback_request(&options, argc - i, argv + i,
-		com_cpsi_callback, send_result, &fd);
+		com_cpsi_callback, rc4_send_result, rc4c);
 	if (ret < 0)
-		send_va_buffer(fd, "%s\n", para_strerror(-ret));
+		rc4_send_va_buffer(rc4c, "%s\n", para_strerror(-ret));
 	return ret;
 }
 
@@ -2431,12 +2446,12 @@ void afs_stat_callback(int fd, const struct osl_object *query)
 	pass_buffer_as_shm(buf, strlen(buf), &fd);
 }
 
-int send_afs_status(int fd, int parser_friendly)
+int send_afs_status(struct rc4_context *rc4c, int parser_friendly)
 {
 	struct osl_object query = {.data = &parser_friendly,
 		.size = sizeof(parser_friendly)};
 
-	return send_callback_request(afs_stat_callback, &query, send_result, &fd);
+	return send_callback_request(afs_stat_callback, &query, rc4_send_result, rc4c);
 }
 
 /* TODO: optionally fix problems by removing offending rows */