aac: fix some signedness warnings

[paraslash.git] / command.c

diff --git a/command.c b/command.c
index 6f6fad7c4028e0f10833cc30033402e126731d66..de56ce8296fdf5d451c5a16b7cd08f2cddc47e1a 100644 (file)
--- a/command.c
+++ b/command.c
@@ -20,7 +20,7 @@
 
 #include <sys/time.h> /* gettimeofday */
 #include "server.cmdline.h"
-#include "db.h"
+#include "afs.h"
 #include "server.h"
 #include "vss.h"
 #include "send.h"
@@ -45,7 +45,6 @@ extern const char *status_item_list[NUM_STAT_ITEMS];
 extern struct misc_meta_data *mmd;
 extern struct audio_file_selector selectors[];
 extern struct sender senders[];
-extern char *user_list;
 
 static void dummy(__a_unused int s)
 {}
@@ -78,8 +77,8 @@ static char *cmd_perms_itohuman(unsigned int perms)
 {
        char *msg = para_malloc(5 * sizeof(char));
 
-       msg[0] = perms & DB_READ? 'a' : '-';
-       msg[1] = perms & DB_WRITE? 'A' : '-';
+       msg[0] = perms & AFS_READ? 'a' : '-';
+       msg[1] = perms & AFS_WRITE? 'A' : '-';
        msg[2] = perms & VSS_READ? 'v' : '-';
        msg[3] = perms & VSS_WRITE? 'V' : '-';
        msg[4] = '\0';
@@ -114,14 +113,14 @@ static char *get_sb_string(struct misc_meta_data *nmmd)
                return para_strdup("");
        if (!base[0])
                return base;
-       if (nmmd->chunks_total) {
-               secs = (long long) nmmd->seconds_total * nmmd->chunks_sent
-                       / nmmd->chunks_total;
-               rsecs = (long long) nmmd->seconds_total *
-                       (nmmd->chunks_total - nmmd->chunks_sent)
-                       / nmmd->chunks_total;
+       if (nmmd->afi.chunks_total) {
+               secs = (long long) nmmd->afi.seconds_total * nmmd->chunks_sent
+                       / nmmd->afi.chunks_total;
+               rsecs = (long long) nmmd->afi.seconds_total *
+                       (nmmd->afi.chunks_total - nmmd->chunks_sent)
+                       / nmmd->afi.chunks_total;
                percent = 100 * ((nmmd->chunks_sent + 5) / 10)
-                       / ((nmmd->chunks_total + 5) / 10);
+                       / ((nmmd->afi.chunks_total + 5) / 10);
        }
        ret = make_message("%llu:%02llu [%llu:%02llu] (%llu%%) %s",
                secs / 60, secs % 60,
@@ -158,7 +157,7 @@ static char *get_status(struct misc_meta_data *nmmd)
                "%s:%s\n"       "%s:%lu.%lu\n"  "%s:%lu.%lu\n",
                status_item_list[SI_FILE_SIZE], nmmd->size / 1024,
                status_item_list[SI_MTIME], mtime,
-               status_item_list[SI_LENGTH], nmmd->seconds_total,
+               status_item_list[SI_LENGTH], nmmd->afi.seconds_total,
                status_item_list[SI_NUM_PLAYED], nmmd->num_played,
 
                status_item_list[SI_STATUS_BAR], bar ? bar : "(none)",
@@ -169,7 +168,7 @@ static char *get_status(struct misc_meta_data *nmmd)
                status_item_list[SI_OFFSET], offset,
                status_item_list[SI_FORMAT], audio_format_name(nmmd->audio_format),
                nmmd->selector_info,
-               nmmd->audio_file_info,
+               nmmd->afi.info_string,
 
                status_item_list[SI_UPTIME], ut,
                status_item_list[SI_STREAM_START],
@@ -649,20 +648,20 @@ int com_ff(__a_unused int fd, int argc, char **argv)
                backwards = 1; /* jmp backwards */
        mmd_lock();
        ret = -E_NO_AUDIO_FILE;
-       if (!mmd->chunks_total || !mmd->seconds_total)
+       if (!mmd->afi.chunks_total || !mmd->afi.seconds_total)
                goto out;
-       promille = (1000 * mmd->current_chunk) / mmd->chunks_total;
+       promille = (1000 * mmd->current_chunk) / mmd->afi.chunks_total;
        if (backwards)
-               promille -= 1000 * i / mmd->seconds_total;
+               promille -= 1000 * i / mmd->afi.seconds_total;
        else
-               promille += 1000 * i / mmd->seconds_total;
+               promille += 1000 * i / mmd->afi.seconds_total;
        if (promille < 0)
                promille = 0;
        if (promille >  1000) {
                mmd->new_vss_status_flags |= VSS_NEXT;
                goto out;
        }
-       mmd->repos_request = (mmd->chunks_total * promille) / 1000;
+       mmd->repos_request = (mmd->afi.chunks_total * promille) / 1000;
        mmd->new_vss_status_flags |= VSS_REPOS;
        mmd->new_vss_status_flags &= ~VSS_NEXT;
        mmd->events++;
@@ -684,12 +683,12 @@ int com_jmp(__a_unused int fd, int argc, char **argv)
                return -E_COMMAND_SYNTAX;
        mmd_lock();
        ret = -E_NO_AUDIO_FILE;
-       if (!mmd->chunks_total)
+       if (!mmd->afi.chunks_total)
                goto out;
        if (i > 100)
                i = 100;
        PARA_INFO_LOG("jumping to %lu%%\n", i);
-       mmd->repos_request = (mmd->chunks_total * i + 50)/ 100;
+       mmd->repos_request = (mmd->afi.chunks_total * i + 50)/ 100;
        PARA_INFO_LOG("sent: %lu,  offset before jmp: %lu\n",
                mmd->chunks_sent, mmd->offset);
        mmd->new_vss_status_flags |= VSS_REPOS;
@@ -793,7 +792,7 @@ int handle_connect(int fd, struct sockaddr_in *addr)
        int numbytes, ret, argc, use_rc4 = 0;
        char buf[4096];
        unsigned char crypt_buf[MAXLINE];
-       struct user u;
+       struct user *u;
        struct server_command *cmd = NULL;
        long unsigned challenge_nr, chall_response;
        char **argv = NULL;
@@ -825,16 +824,18 @@ int handle_connect(int fd, struct sockaddr_in *addr)
                goto err_out;
 
        if (numbytes < 9 || strncmp(buf, "auth rc4 ", 9))
-               u.name = para_strdup(buf + 5); /* client version < 0.2.6 */
+               p = buf + 5; /* client version < 0.2.6 */
        else {
-               u.name = para_strdup(buf + 9); /* client version >= 0.2.6 */
+               p = buf + 9; /* client version >= 0.2.6 */
                use_rc4 = 1;
        }
        PARA_DEBUG_LOG("received %s request for user %s\n",
-               use_rc4? "rc4" : "auth", u.name);
-       if ((ret = lookup_user(&u)) < 0)
+               use_rc4? "rc4" : "auth", p);
+       ret = -E_BAD_USER;
+       u = lookup_user(p);
+       if (!u)
                goto err_out;
-       ret = para_encrypt_challenge(u.rsa, challenge_nr, crypt_buf);
+       ret = para_encrypt_challenge(u->rsa, challenge_nr, crypt_buf);
        if (ret <= 0)
                goto err_out;
        numbytes = ret;
@@ -855,11 +856,11 @@ int handle_connect(int fd, struct sockaddr_in *addr)
                        || chall_response != challenge_nr)
                goto err_out;
        /* auth successful. Send 'Proceed' message */
-       PARA_INFO_LOG("good auth for %s (%lu)\n", u.name, challenge_nr);
+       PARA_INFO_LOG("good auth for %s (%lu)\n", u->name, challenge_nr);
        sprintf(buf, "%s", PROCEED_MSG);
        if (use_rc4) {
                init_rc4_keys();
-               ret = para_encrypt_buffer(u.rsa, rc4_buf, 2 * RC4_KEY_LEN,
+               ret = para_encrypt_buffer(u->rsa, rc4_buf, 2 * RC4_KEY_LEN,
                        (unsigned char *)buf + PROCEED_MSG_LEN + 1);
                if (ret <= 0)
                        goto err_out;
@@ -891,7 +892,7 @@ int handle_connect(int fd, struct sockaddr_in *addr)
        if (!(cmd = parse_cmd(command)))
                goto err_out;
        /* valid command, check permissions */
-       ret = check_perms(u.perms, cmd);
+       ret = check_perms(u->perms, cmd);
        if (ret < 0)
                goto err_out;
        /* valid command and sufficient perms */
@@ -900,7 +901,7 @@ int handle_connect(int fd, struct sockaddr_in *addr)
        mmd_lock();
        mmd->num_commands++;
        mmd_unlock();
-       PARA_NOTICE_LOG("calling com_%s() for %s@%s\n", cmd->name, u.name,
+       PARA_NOTICE_LOG("calling com_%s() for %s@%s\n", cmd->name, u->name,
                inet_ntoa(addr->sin_addr));
        ret = cmd->handler(fd, argc, argv);
        if (ret >= 0) {
@@ -917,7 +918,7 @@ out:
        free(command);
        free(argv);
        mmd_lock();
-       if (cmd && (cmd->perms & DB_WRITE) && ret >= 0)
+       if (cmd && (cmd->perms & AFS_WRITE) && ret >= 0)
                mmd->events++;
        mmd->active_connections--;
        mmd_unlock();