X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afs.c;h=ef05a473e85a022568a785ecc8da140d2b19d1dc;hp=3a752acaaf9e1631a31704521317967d58886009;hb=f5ec2fd02149c64869beadfb7575c17141e0c58e;hpb=e9dd7df880c68a2d664ea10d167e6667707f9fd5

diff --git a/afs.c b/afs.c
index 3a752aca..ef05a473 100644
--- a/afs.c
+++ b/afs.c
@@ -37,22 +37,22 @@
 #include "sideband.h"
 #include "command.h"
 
-/** The osl tables used by afs. \sa blob.c. */
+/** The osl tables used by afs. \sa \ref blob.c. */
 enum afs_table_num {
-	/** Contains audio file information. See aft.c. */
+	/** Contains audio file information. See \ref aft.c. */
 	TBLNUM_AUDIO_FILES,
-	/** The table for the paraslash attributes. See attribute.c. */
+	/** The table for the paraslash attributes. See \ref attribute.c. */
 	TBLNUM_ATTRIBUTES,
 	/**
 	 * Paraslash's scoring system is based on Gaussian normal
 	 * distributions, and the relevant data is stored in the rbtrees of an
-	 * osl table containing only volatile columns.  See score.c for
+	 * osl table containing only volatile columns. See \ref score.c for
 	 * details.
 	 */
 	TBLNUM_SCORES,
 	/**
 	 * A standard blob table containing the mood definitions. For details
-	 * see mood.c.
+	 * see \ref mood.c.
 	 */
 	TBLNUM_MOODS,
 	/** A blob table containing lyrics on a per-song basis. */
@@ -130,7 +130,7 @@ extern uint32_t afs_socket_cookie;
  * command socket, so that the handler process can read the id, attach the
  * shared memory area and use the result.
  *
- * \sa struct callback_result.
+ * \sa \ref struct callback_result.
  */
 struct callback_query {
 	/** The function to be called. */
@@ -146,7 +146,7 @@ struct callback_query {
  * into the shared memory area holding the result, mainly to let the command
  * handler know the size of the result.
  *
- * \sa struct callback_query.
+ * \sa \ref struct callback_query.
  */
 struct callback_result {
 	/** The number of bytes of the result. */
@@ -201,9 +201,8 @@ static int dispatch_result(int result_shmid, callback_result_handler *handler,
  * shmid are passed to that function as an osl object. The private_result_data
  * pointer is passed as the second argument to \a result_handler.
  *
- * \return Number of shared memory areas dispatched on success, negative on errors.
- *
- * \sa send_option_arg_callback_request(), send_standard_callback_request().
+ * \return Number of shared memory areas dispatched on success, negative on
+ * errors.
  */
 int send_callback_request(afs_callback *f, struct osl_object *query,
 		callback_result_handler *result_handler,
@@ -381,7 +380,7 @@ int for_each_matching_row(struct pattern_match_data *pmd)
  * \a obj1 is found, respectively, to be less than, to match, or be greater than
  * obj2.
  *
- * \sa strcmp(3), strncmp(3), osl_compare_func.
+ * \sa strcmp(3), strncmp(3).
  */
 int string_compare(const struct osl_object *obj1, const struct osl_object *obj2)
 {
@@ -433,7 +432,7 @@ static int pass_afd(int fd, char *buf, size_t size)
  *
  * \return Standard.
  *
- * \sa open_and_update_audio_file().
+ * \sa \ref open_and_update_audio_file().
  */
 static int open_next_audio_file(void)
 {
@@ -483,7 +482,7 @@ static int activate_mood_or_playlist(const char *arg, int *num_admissible)
 			ret = change_current_mood(arg + 2);
 			mode = PLAY_MODE_MOOD;
 		} else
-			return -E_AFS_SYNTAX;
+			return -ERRNO_TO_PARA_ERROR(EINVAL);
 		if (ret < 0)
 			return ret;
 	}
@@ -498,10 +497,12 @@ static int activate_mood_or_playlist(const char *arg, int *num_admissible)
 			strncpy(mmd->afs_mode_string, arg,
 				sizeof(mmd->afs_mode_string));
 			mmd->afs_mode_string[sizeof(mmd->afs_mode_string) - 1] = '\0';
+			mmd->events++;
 			mutex_unlock(mmd_mutex);
 		} else {
 			mutex_lock(mmd_mutex);
 			strcpy(mmd->afs_mode_string, "dummy");
+			mmd->events++;
 			mutex_unlock(mmd_mutex);
 			current_mop = NULL;
 		}
@@ -581,7 +582,7 @@ static int com_select_callback(struct afs_callback_arg *aca)
 		goto out;
 	/* ignore subsequent errors (but log them) */
 	para_printf(&aca->pbout, "could not activate %s\n", arg);
-	if (current_mop) {
+	if (current_mop && strcmp(current_mop, arg) != 0) {
 		int ret2;
 		para_printf(&aca->pbout, "switching back to %s\n", current_mop);
 		ret2 = activate_mood_or_playlist(current_mop, &num_admissible);
@@ -616,8 +617,13 @@ EXPORT_SERVER_CMD_HANDLER(select);
 
 static void init_admissible_files(const char *arg)
 {
-	if (activate_mood_or_playlist(arg, NULL) < 0)
+	int ret = activate_mood_or_playlist(arg, NULL);
+	if (ret < 0) {
+		assert(arg);
+		PARA_WARNING_LOG("could not activate %s: %s\n", arg,
+			para_strerror(-ret));
 		activate_mood_or_playlist(NULL, NULL); /* always successful */
+	}
 }
 
 static int setup_command_socket_or_die(void)
@@ -626,15 +632,10 @@ static int setup_command_socket_or_die(void)
 	const char *socket_name = OPT_STRING_VAL(AFS_SOCKET);
 
 	unlink(socket_name);
-	ret = create_local_socket(socket_name, 0);
+	ret = create_local_socket(socket_name);
 	if (ret < 0) {
-		ret = create_local_socket(socket_name,
-			S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IROTH);
-		if (ret < 0) {
-			PARA_EMERG_LOG("%s: %s\n", para_strerror(-ret),
-				socket_name);
-			exit(EXIT_FAILURE);
-		}
+		PARA_EMERG_LOG("%s: %s\n", para_strerror(-ret), socket_name);
+		exit(EXIT_FAILURE);
 	}
 	socket_fd = ret;
 	PARA_INFO_LOG("listening on socket %s (fd %d)\n", socket_name,