const char *replacement;
};
-static struct para_macro macro_list[] = {
+static const struct para_macro mysql_macro_list[] = {
{ .name = "IS_N_SET",
.replacement = "(data.%s != '1')"
}, {
* \return \p NULL if one of the underlying calls to \p s_a_r returned \p NULL.
* Otherwise the completely expanded version of \p src is returned.
*/
-__must_check __malloc static char *s_a_r_list(struct para_macro *macro_list, char *src)
+__must_check __malloc static char *s_a_r_list(const struct para_macro *macro_list,
+ char *src)
{
- struct para_macro *mp = macro_list;
+ const struct para_macro *mp = macro_list;
char *ret = NULL, *tmp = para_strdup(src);
while (mp->name) {
return ret;
}
-static char *escape_blob(const char* old, int size)
+static char *escape_blob(const char* old, size_t size)
{
char *new;
- if (!mysql_ptr || size < 0)
+ if (!mysql_ptr)
return NULL;
new = para_malloc(2 * size * sizeof(char) + 1);
mysql_real_escape_string(mysql_ptr, new, old, size);
* print results to fd
*/
static int print_results(int fd, void *result,
- unsigned int top, unsigned int left,
- unsigned int bottom, unsigned int right)
+ my_ulonglong top, my_ulonglong left,
+ my_ulonglong bottom, my_ulonglong right)
{
unsigned int i,j;
int ret;
{
void *result = NULL;
int ret;
- unsigned int num_rows, num_fields;
+ my_ulonglong num_rows, num_fields, top = 0, left = 0;
char *tmp;
if (argc < 2)
num_rows = mysql_num_rows(result);
ret = 1;
if (num_fields && num_rows)
- ret = print_results(fd, result, 0, 0, num_rows - 1,
+ ret = print_results(fd, result, top, left, num_rows - 1,
num_fields - 1);
mysql_free_result(result);
return ret;
mysql_free_result(result);
return NULL;
}
- mysql_data_seek(result, 4); /* skip Lastplayed, Numplayed... */
+ mysql_data_seek(result, (my_ulonglong)4); /* skip Lastplayed, Numplayed... */
return result;
}
{
void *result;
int ret;
+ my_ulonglong top = 0, left = 0, bottom, right = 0;
if (argc != 1)
return -E_MYSQL_SYNTAX;
result = get_all_attributes();
if (!result)
return -E_NOATTS;
- ret = print_results(fd, result, 0, 0, mysql_num_rows(result) - 5, 0);
+ bottom = mysql_num_rows(result);
+ if (bottom < 5)
+ return -E_MYSQL_SYNTAX;
+ bottom -= 5;
+ ret = print_results(fd, result, top, left, bottom, right);
mysql_free_result(result);
return ret;
}
int ret;
void *result = NULL;
char *q, *atts;
- unsigned int num_rows;
+ my_ulonglong num_rows, top = 0, left = 0, right = 1;
if (argc > 3)
return -E_MYSQL_SYNTAX;
num_rows = mysql_num_rows(result);
ret = 1;
if (num_rows)
- ret = print_results(fd, result, 0, 0, num_rows - 1, 1);
+ ret = print_results(fd, result, top, left, num_rows - 1, right);
mysql_free_result(result);
return ret;
}
void *result = NULL;
char *q;
int num, ret;
+ my_ulonglong top = 0, left = 0, right = 0;
if (argc < 2)
num = 10;
free(q);
if (!result)
return -E_NORESULT;
- ret = print_results(fd, result, 0, 0, mysql_num_rows(result) - 1, 0);
+ ret = print_results(fd, result, top, left, mysql_num_rows(result) - 1,
+ right);
mysql_free_result(result);
return ret;
}
void *result;
MYSQL_ROW row;
int ret;
- unsigned int num_rows, num_fields;
+ my_ulonglong num_rows, num_fields, top = 0, left = 0;
char *query = para_strdup("select concat('From foo@localhost ', "
"date_format(Lastplayed, '%a %b %e %T %Y'), "
"'\nReceived: from\nTo: bar\n");
num_rows = mysql_num_rows(result);
if (!num_fields || !num_rows)
goto out;
- ret = print_results(fd, result, 0, 0, num_rows - 1, num_fields - 1);
+ ret = print_results(fd, result, top, left, num_rows - 1,
+ num_fields - 1);
out:
free(query);
if (result)
void *result = NULL, *result2 = NULL;
MYSQL_ROW row, row2;
int i;
- unsigned num_fields;
+ my_ulonglong num_fields, offset = 4; /* skip Lastplayed, Numplayed... */
+
result2 = get_all_attributes();
if (!result2)
num_fields = mysql_num_fields(result);
if (num_fields < 5)
goto out;
- mysql_data_seek(result2, 4); /* skip Lastplayed, Numplayed... */
+ mysql_data_seek(result2, offset);
row = mysql_fetch_row(result);
if (!row)
goto out;
continue;
arg = line + n;
if (!strcmp(command, "accept:")) {
- char *tmp2 = s_a_r_list(macro_list, arg);
+ char *tmp2 = s_a_r_list(mysql_macro_list, arg);
if (accept_opts)
accept_opts = para_strcat(
accept_opts, " or ");
continue;
}
if (!strcmp(command, "deny:")) {
- char *tmp2 = s_a_r_list(macro_list, arg);
+ char *tmp2 = s_a_r_list(mysql_macro_list, arg);
if (deny_opts)
deny_opts = para_strcat(deny_opts, " or ");
deny_opts = para_strcat(deny_opts, tmp2);
continue;
}
if (!score && !strcmp(command, "score:"))
- score = s_a_r_list(macro_list, arg);
+ score = s_a_r_list(mysql_macro_list, arg);
}
if (!score) {
- score = s_a_r_list(macro_list, conf.mysql_default_score_arg);
+ score = s_a_r_list(mysql_macro_list, conf.mysql_default_score_arg);
if (!score)
goto out;
}
return info;
}
-
/* might return NULL */
static char *get_current_audio_file(void)
{
return name;
}
+/* If called as child, mmd_lock must be held */
+static void update_mmd(char *info)
+{
+ PARA_DEBUG_LOG("%s", "updating shared memory area\n");
+ strncpy(mmd->selector_info, info, MMD_INFO_SIZE - 1);
+ mmd->selector_info[MMD_INFO_SIZE - 1] = '\0';
+}
+
+static void refresh_selector_info(void)
+{
+ char *name = get_current_audio_file();
+ char *info;
+
+ if (!name)
+ return;
+ info = get_selector_info(name);
+ free(name);
+ mmd_lock();
+ update_mmd(info);
+ mmd_unlock();
+ free(info);
+}
+
/* list attributes / print database info */
static int com_la_info(int fd, int argc, char *argv[])
{
char *name = NULL, *meta = NULL, *atts = NULL, *dir = NULL;
- int ret, com_la = strcmp(argv[0], "info");
+ int ret, la = strcmp(argv[0], "info");
if (argc < 2) {
ret = -E_GET_AUDIO_FILE;
meta = get_meta(name, 1);
atts = get_atts(name, 0);
dir = get_dir(name);
- if (com_la)
+ if (la)
ret = send_va_buffer(fd, "%s\n", atts);
else
ret = send_va_buffer(fd, "dir: %s\n" "%s\n" "attributes: %s\n",
{
char *q, *ebn;
void *result = NULL;
- long unsigned ret;
+ int ret;
MYSQL_ROW row;
if (!(ebn = escaped_basename(name)))
row = mysql_fetch_row(result);
ret = -E_NOROW;
if (row && row[0])
- ret = atol(row[0]);
+ ret = atoi(row[0]);
mysql_free_result(result);
return ret;
}
*/
int com_snp(int fd, int argc, char *argv[])
{
- return com_set(fd, argc, argv);
+ int ret = com_set(fd, argc, argv);
+ if (ret >= 0)
+ refresh_selector_info();
+ return ret;
}
/*
char *q;
void *result;
int ret;
- unsigned int num_rows;
+ my_ulonglong num_rows, top = 0, left = 0, right = 0;
if (argc > 2)
return -E_MYSQL_SYNTAX;
num_rows = mysql_num_rows(result);
ret = 1;
if (num_rows)
- ret = print_results(fd, result, 0, 0, num_rows - 1, 0);
+ ret = print_results(fd, result, top, left, num_rows - 1, right);
mysql_free_result(result);
return ret;
}
return ret;
}
-/* If called as child, mmd_lock must be held */
-static void update_mmd(char *info)
-{
- PARA_DEBUG_LOG("%s", "updating shared memory area\n");
- strncpy(mmd->selector_info, info, MMD_INFO_SIZE - 1);
- mmd->selector_info[MMD_INFO_SIZE - 1] = '\0';
-}
-
static void update_audio_file_server_handler(char *name)
{
char *info;
return -E_ESCAPE;
ret = update_audio_file(argv[1]);
free(tmp);
+ if (ret >= 0)
+ refresh_selector_info();
return ret;
}
-static void refresh_selector_info(void)
-{
- char *name = get_current_audio_file();
- char *info;
-
- if (!name)
- return;
- info = get_selector_info(name);
- free(name);
- mmd_lock();
- update_mmd(info);
- mmd_unlock();
- free(info);
-}
-
/* select previous / next stream */
static int com_ps_ns(__a_unused int fd, int argc, char *argv[])
{
char *query, *stream = get_current_stream();
void *result = get_result("select name from streams");
MYSQL_ROW row;
- int match = -1, ret, i;
- unsigned int num_rows;
+ int ret;
+ my_ulonglong num_rows, match, i;
+ ret = -E_MYSQL_SYNTAX;
if (argc != 1)
- return -E_MYSQL_SYNTAX;
+ goto out;
ret = -E_NORESULT;
if (!result)
goto out;
goto out;
if (!strcmp(row[0], "current_stream"))
continue;
- if (!strcmp(row[0], stream)) {
- match = i;
+ if (!strcmp(row[0], stream))
break;
- }
}
ret = -E_NO_STREAM;
- if (match < 0)
+ if (i == num_rows)
goto out;
+ match = i;
if (!strcmp(argv[0], "ps"))
i = match > 0? match - 1 : num_rows - 1;
else
goto out;
if (!strcmp(row[0], "current_stream")) {
if (!strcmp(argv[0], "ps")) {
- i = match - 2;
- i = i < 0? i + num_rows : i;
+ i = match < 2? match + num_rows - 2 : match - 2;
} else {
i = match + 2;
i = i > num_rows - 1? i - num_rows : i;
char *query;
int ret, vrfy_mode = strcmp(argv[0], "clean");
void *result = NULL;
- unsigned int num_rows;
MYSQL_ROW row;
char *escaped_name;
+ my_ulonglong num_rows, top = 0, left = 0, right = 0;
if (argc != 1)
return -E_MYSQL_SYNTAX;
if (vrfy_mode) {
send_va_buffer(fd, "found %i invalid entr%s\n", num_rows,
num_rows == 1? "y" : "ies");
- ret = print_results(fd, result, 0, 0, num_rows - 1, 0);
+ ret = print_results(fd, result, top, left, num_rows - 1, right);
goto out;
}
while ((row = mysql_fetch_row(result))) {
static int init_mysql_server(void)
{
char *u = conf.mysql_user_arg? conf.mysql_user_arg : para_logname();
+ unsigned int port;
mysql_ptr = mysql_init(NULL);
if (!mysql_ptr) {
PARA_CRIT_LOG("%s", "mysql init error\n");
return -E_NOTCONN;
}
- PARA_DEBUG_LOG("connecting: %s@%s:%d\n", u, conf.mysql_host_arg,
- conf.mysql_port_arg);
+ if (conf.mysql_port_arg < 0)
+ return -E_MYSQL_SYNTAX;
+ port = conf.mysql_port_arg;
+ PARA_DEBUG_LOG("connecting: %s@%s:%d\n", u, conf.mysql_host_arg, port);
if (!conf.mysql_user_arg)
free(u);
/*
conf.mysql_user_arg,
conf.mysql_passwd_arg,
conf.mysql_database_arg,
- conf.mysql_port_arg, NULL, 0))) {
+ port, NULL, 0))) {
PARA_CRIT_LOG("%s", "connect error\n");
return -E_NOTCONN;
}
projects / paraslash.git / blobdiff