Added tag 0.5 for changeset 70d49a37b35695f2f771bddaf309f05ea60af8bc

[sic.git] / sic.c

diff --git a/sic.c b/sic.c
index 6b432f5e441cc8c68ab8343836f597af5c12784c..190ac9b24fdd9d89cbd39654f5c77030842a28eb 100644 (file)
--- a/sic.c
+++ b/sic.c
@@ -76,7 +76,7 @@ parsein(char *msg) {
        else if(!strncmp(msg + 1, "l ", 2))
                snprintf(bufout, sizeof(bufout), "PART %s :sic\r\n", &msg[3]);
        else if(!strncmp(msg + 1, "m ", 2)) {
-               if(p = strchr(&msg[3], ' '))
+               if((p = strchr(&msg[3], ' ')))
                        *(p++) = 0;
                privmsg(&msg[3], p);
                return;
@@ -86,7 +86,7 @@ parsein(char *msg) {
                return;
        }
        else if(!strncmp(msg + 1, "t ", 2)) {
-               if(p = strchr(&msg[3], ' '))
+               if((p = strchr(&msg[3], ' ')))
                        *(p++) = 0;
                snprintf(bufout, sizeof(bufout), "TOPIC %s :%s\r\n", &msg[3], p);
        }
@@ -231,32 +231,30 @@ main(int argc, char *argv[]) {
        fd_set rd;
 
        nick = fullname = getenv("USER");
-       for(i = 1; (i < argc) && (argv[i][0] == '-'); i++)
-               switch (argv[i][1]) {
-               default:
+       for(i = 1; i < argc; i++)
+               if(!strncmp(argv[i], "-s", 3)) {
+                       if(++i < argc) server = argv[i];
+               }
+               else if(!strncmp(argv[i], "-p", 3)) {
+                       if(++i < argc) port = (unsigned short)atoi(argv[i]);
+               }
+               else if(!strncmp(argv[i], "-n", 3)) {
+                       if(++i < argc) nick = argv[i];
+               }
+               else if(!strncmp(argv[i], "-k", 3)) {
+                       if(++i < argc) password = argv[i];
+               }
+               else if(!strncmp(argv[i], "-f", 3)) {
+                       if(++i < argc) fullname = argv[i];
+               }
+               else if(!strncmp(argv[i], "-v", 3)) {
+                       fputs("sic-"VERSION", (C)opyright MMVI Anselm R. Garbe\n", stdout);
+                       exit(EXIT_SUCCESS);
+               }
+               else {
                        fputs("usage: sic [-s server] [-p port] [-n nick]"
                                        " [-k keyword] [-f fullname] [-v]\n", stderr);
                        exit(EXIT_FAILURE);
-                       break;
-               case 's':
-                       server = argv[++i];
-                       break;
-               case 'p':
-                       port = (unsigned short)atoi(argv[++i]);
-                       break;
-               case 'n':
-                       nick = argv[++i];
-                       break;
-               case 'k':
-                       password = argv[++i];
-                       break;
-               case 'f':
-                       fullname = argv[++i];
-                       break;
-               case 'v':
-                       fputs("sic-"VERSION", (C)opyright MMVI Anselm R. Garbe\n", stdout);
-                       exit(EXIT_SUCCESS);
-                       break;
                }
 
        /* init */