fix memset bug in enable_crypt()

[paraslash.git] / fade.c

diff --git a/fade.c b/fade.c
index 1f66b363e0dc836f629ace5170c661ad2b9e364e..b42e4a1c713c6b660c4c32a2c382bcef7f82cac4 100644 (file)
--- a/fade.c
+++ b/fade.c
@@ -20,7 +20,9 @@
 
 #include "fade.cmdline.h"
 #include "para.h"
+#include "fd.h"
 
+#include <stropts.h>
 #include <ctype.h>
 #include <curses.h>
 #include <stdlib.h> /* EXIT_SUCCESS */
@@ -32,9 +34,9 @@
 #include "string.h"
 
 
-struct gengetopt_args_info args_info;
+struct fade_args_info args_info;
 
-void para_log(__unused int ll, char *fmt,...)
+void para_log(__a_unused int ll, const char *fmt,...)
 {
        va_list argp;
        time_t t1;
@@ -53,11 +55,11 @@ void para_log(__unused int ll, char *fmt,...)
  */
 static int open_mixer(void)
 {
-        int mixer_fd;
+       int mixer_fd;
 
-        if ((mixer_fd = open(args_info.mixer_device_arg, O_RDWR, 0)) < 0)
-                return -1;
-        return mixer_fd;
+       if ((mixer_fd = open(args_info.mixer_device_arg, O_RDWR, 0)) < 0)
+               return -1;
+       return mixer_fd;
 }
 
 /*
@@ -167,10 +169,10 @@ out:
        return 1;
 }
 
-static int client_cmd(char *cmd,...)
+static int client_cmd(const char *cmd,...)
 {
        int ret, fds[3] = {0, 0, 0};
-        pid_t pid;
+       pid_t pid;
        char *cmdline = make_message(BINDIR "/para_client %s", cmd);
        PARA_INFO_LOG("%s", cmdline);
        ret = para_exec_cmdline_pid(&pid, cmdline, fds);
@@ -277,7 +279,7 @@ int main(int argc, char *argv[])
 {
        int ret;
 
-       if (cmdline_parser(argc, argv, &args_info))
+       if (fade_cmdline_parser(argc, argv, &args_info))
                exit(EXIT_FAILURE);
        ret = configfile_exists();
        if (!ret && args_info.config_file_given) {
@@ -286,7 +288,7 @@ int main(int argc, char *argv[])
                exit(EXIT_FAILURE);
        }
        if (ret)
-               cmdline_parser_configfile(args_info.config_file_arg,
+               fade_cmdline_parser_configfile(args_info.config_file_arg,
                        &args_info, 0, 0, 0);
        if ((ret = open_mixer()) < 0) {
                PARA_EMERG_LOG("can not open mixer device %s.",