head 1.2; access; symbols perseant-exfatfs-base-20250801:1.2 perseant-exfatfs-base-20240630:1.2 perseant-exfatfs:1.2.0.34 perseant-exfatfs-base:1.2 cjep_sun2x:1.2.0.32 cjep_sun2x-base:1.2 cjep_staticlib_x-base1:1.2 cjep_staticlib_x:1.2.0.30 cjep_staticlib_x-base:1.2 phil-wifi-20200421:1.2 phil-wifi-20200411:1.2 phil-wifi-20200406:1.2 pgoyette-compat-merge-20190127:1.2 pgoyette-compat-20190127:1.2 pgoyette-compat-20190118:1.2 pgoyette-compat-1226:1.2 pgoyette-compat-1126:1.2 pgoyette-compat-1020:1.2 pgoyette-compat-0930:1.2 pgoyette-compat-0906:1.2 pgoyette-compat-0728:1.2 pgoyette-compat-0625:1.2 pgoyette-compat-0521:1.2 pgoyette-compat-0502:1.2 pgoyette-compat-0422:1.2 pgoyette-compat-0415:1.2 pgoyette-compat-0407:1.2 pgoyette-compat-0330:1.2 pgoyette-compat-0322:1.2 pgoyette-compat-0315:1.2 pgoyette-compat:1.2.0.28 pgoyette-compat-base:1.2 prg-localcount2-base3:1.2 prg-localcount2-base2:1.2 prg-localcount2-base1:1.2 prg-localcount2:1.2.0.26 prg-localcount2-base:1.2 pgoyette-localcount-20170426:1.2 bouyer-socketcan-base1:1.2 pgoyette-localcount-20170320:1.2 bouyer-socketcan:1.2.0.24 bouyer-socketcan-base:1.2 pgoyette-localcount-20170107:1.2 pgoyette-localcount-20161104:1.2 localcount-20160914:1.2 pgoyette-localcount-20160806:1.2 pgoyette-localcount-20160726:1.2 pgoyette-localcount:1.2.0.22 pgoyette-localcount-base:1.2 netbsd-5-2-3-RELEASE:1.2 netbsd-5-1-5-RELEASE:1.2 yamt-pagecache-base9:1.2 yamt-pagecache-tag8:1.2 tls-earlyentropy:1.2.0.18 tls-earlyentropy-base:1.2 riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.2 riastradh-drm2-base3:1.2 netbsd-5-2-2-RELEASE:1.2 netbsd-5-1-4-RELEASE:1.2 netbsd-5-2-1-RELEASE:1.2 netbsd-5-1-3-RELEASE:1.2 agc-symver:1.2.0.20 agc-symver-base:1.2 tls-maxphys-base:1.2 yamt-pagecache-base8:1.2 netbsd-5-2:1.2.0.16 yamt-pagecache-base7:1.2 netbsd-5-2-RELEASE:1.2 netbsd-5-2-RC1:1.2 yamt-pagecache-base6:1.2 yamt-pagecache-base5:1.2 yamt-pagecache-base4:1.2 netbsd-5-1-2-RELEASE:1.2 netbsd-5-1-1-RELEASE:1.2 yamt-pagecache-base3:1.2 yamt-pagecache-base2:1.2 yamt-pagecache:1.2.0.2 yamt-pagecache-base:1.2 bouyer-quota2-nbase:1.2 bouyer-quota2:1.2.0.14 bouyer-quota2-base:1.2 matt-nb5-pq3:1.2.0.12 matt-nb5-pq3-base:1.2 netbsd-5-1:1.2.0.10 netbsd-5-1-RELEASE:1.2 netbsd-5-1-RC4:1.2 netbsd-5-1-RC3:1.2 netbsd-5-1-RC2:1.2 netbsd-5-1-RC1:1.2 netbsd-5-0-2-RELEASE:1.2 netbsd-5-0-1-RELEASE:1.2 jym-xensuspend-nbase:1.2 netbsd-5-0:1.2.0.8 netbsd-5-0-RELEASE:1.2 netbsd-5-0-RC4:1.2 netbsd-5-0-RC3:1.2 netbsd-5-0-RC2:1.2 jym-xensuspend:1.2.0.6 jym-xensuspend-base:1.2 netbsd-5-0-RC1:1.2 netbsd-5:1.2.0.4 netbsd-5-base:1.2 wrstuden-revivesa-base-1:1.1.1.1 yamt-pf42-base4:1.1.1.1 yamt-pf42-base3:1.1.1.1 hpcarm-cleanup-nbase:1.1.1.1 hpcarm-cleanup-base:1.1.1.1 yamt-pf42-baseX:1.1.1.1 yamt-pf42-base2:1.1.1.1 wrstuden-revivesa:1.1.1.1.0.8 wrstuden-revivesa-base:1.1.1.1 yamt-pf42:1.1.1.1.0.6 yamt-pf42-base:1.1.1.1 matt-armv6:1.1.1.1.0.4 matt-armv6-nbase:1.1.1.1 keiichi-mipv6:1.1.1.1.0.2 keiichi-mipv6-base:1.1.1.1 v0_6_2:1.1.1.1 MALINEN:1.1.1; locks; strict; comment @# @; 1.2 date 2008.08.10.07.30.53; author christos; state dead; branches; next 1.1; 1.1 date 2008.01.26.21.39.40; author christos; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2008.01.26.21.39.40; author christos; state Exp; branches 1.1.1.1.4.1 1.1.1.1.8.1; next ; 1.1.1.1.4.1 date 2008.01.26.21.39.40; author matt; state dead; branches; next 1.1.1.1.4.2; 1.1.1.1.4.2 date 2008.03.23.00.17.28; author matt; state Exp; branches; next ; 1.1.1.1.8.1 date 2008.09.07.20.22.54; author wrstuden; state dead; branches; next ; desc @@ 1.2 log @delete junk file. @ text @Only in .: o diff -ru /usr/src/dist/wpa/wpa_supplicant/wpa_cli.c ./wpa_cli.c --- /usr/src/dist/wpa/wpa_supplicant/wpa_cli.c 2008-01-17 21:43:46.000000000 -0500 +++ ./wpa_cli.c 2008-01-01 22:09:23.000000000 -0500 @@@@ -206,43 +206,9 @@@@ } -static const char *skip_priority(const char *msg) -{ - const char *pos = msg; - - if (*msg != '<') - return msg; - - for (pos = msg + 1; isdigit((unsigned char)*pos); pos++) - continue; - - if (*pos != '>') - return msg; - - return ++pos; -} - -static const char *fmttime(char *buf, size_t buflen) -{ - struct timeval tv; - struct tm tm; - time_t t; - - if (buflen <= 8) - return NULL; - - (void)gettimeofday(&tv, NULL); - t = (time_t)tv.tv_sec; - (void)localtime_r(&t, &tm); - (void)strftime(buf, buflen, "%H:%M:%S", &tm); - (void)snprintf(buf + 8, buflen - 8, ".%.3d", (int)(tv.tv_usec / 1000)); - return buf; -} - static void wpa_cli_msg_cb(char *msg, size_t len) { - char tbuf[32]; - printf("%s: %s\n", fmttime(tbuf, sizeof(tbuf)), skip_priority(msg)); + printf("%s\n", msg); } @@@@ -268,7 +234,7 @@@@ } if (print) { buf[len] = '\0'; - wpa_cli_msg_cb(buf, 0); + printf("%s", buf); } return 0; } @@@@ -1186,11 +1152,21 @@@@ static void wpa_cli_action_process(const char *msg) { - const char *pos = skip_priority(msg); + const char *pos; + char *copy = NULL, *id, *pos2; + + pos = msg; + if (*pos == '<') { + /* skip priority */ + pos = os_strchr(pos, '>'); + if (pos) + pos++; + else + pos = msg; + } if (str_match(pos, WPA_EVENT_CONNECTED)) { int new_id = -1; - char *id; os_unsetenv("WPA_ID"); os_unsetenv("WPA_ID_STR"); os_unsetenv("WPA_CTRL_DIR"); @@@@ -1260,6 +1236,7 @@@@ } } + static void wpa_cli_recv_pending(struct wpa_ctrl *ctrl, int in_read, int action_monitor) { @@@@ -1279,7 +1256,7 @@@@ if (in_read && first) printf("\n"); first = 0; - wpa_cli_msg_cb(buf, 0); + printf("%s\n", buf); } } else { printf("Could not read pending message.\n"); @@@@ -1431,7 +1408,7 @@@@ history_set_pos(0); h = next_history(); while (h) { - const char *p = h->line; + char *p = h->line; while (*p == ' ' || *p == '\t') p++; if (os_strncasecmp(p, "pa", 2) == 0 || @@@@ -1439,8 +1416,8 @@@@ os_strncasecmp(p, "n", 1)) { h = remove_history(where_history()); if (h) { - os_free(__UNCONST(h->line)); - os_free(__UNCONST(h->data)); + os_free(h->line); + os_free(h->data); os_free(h); } h = current_history(); Only in /usr/src/dist/wpa/wpa_supplicant/: wpa_cli.c.orig @ 1.1 log @Initial revision @ text @@ 1.1.1.1 log @Import new wpa_supplicant code @ text @@ 1.1.1.1.8.1 log @Delete a bunch of things that are now gone in head. @ text @@ 1.1.1.1.4.1 log @file o was added on branch matt-armv6 on 2008-03-23 00:17:28 +0000 @ text @d1 120 @ 1.1.1.1.4.2 log @sync with HEAD @ text @a0 120 Only in .: o diff -ru /usr/src/dist/wpa/wpa_supplicant/wpa_cli.c ./wpa_cli.c --- /usr/src/dist/wpa/wpa_supplicant/wpa_cli.c 2008-01-17 21:43:46.000000000 -0500 +++ ./wpa_cli.c 2008-01-01 22:09:23.000000000 -0500 @@@@ -206,43 +206,9 @@@@ } -static const char *skip_priority(const char *msg) -{ - const char *pos = msg; - - if (*msg != '<') - return msg; - - for (pos = msg + 1; isdigit((unsigned char)*pos); pos++) - continue; - - if (*pos != '>') - return msg; - - return ++pos; -} - -static const char *fmttime(char *buf, size_t buflen) -{ - struct timeval tv; - struct tm tm; - time_t t; - - if (buflen <= 8) - return NULL; - - (void)gettimeofday(&tv, NULL); - t = (time_t)tv.tv_sec; - (void)localtime_r(&t, &tm); - (void)strftime(buf, buflen, "%H:%M:%S", &tm); - (void)snprintf(buf + 8, buflen - 8, ".%.3d", (int)(tv.tv_usec / 1000)); - return buf; -} - static void wpa_cli_msg_cb(char *msg, size_t len) { - char tbuf[32]; - printf("%s: %s\n", fmttime(tbuf, sizeof(tbuf)), skip_priority(msg)); + printf("%s\n", msg); } @@@@ -268,7 +234,7 @@@@ } if (print) { buf[len] = '\0'; - wpa_cli_msg_cb(buf, 0); + printf("%s", buf); } return 0; } @@@@ -1186,11 +1152,21 @@@@ static void wpa_cli_action_process(const char *msg) { - const char *pos = skip_priority(msg); + const char *pos; + char *copy = NULL, *id, *pos2; + + pos = msg; + if (*pos == '<') { + /* skip priority */ + pos = os_strchr(pos, '>'); + if (pos) + pos++; + else + pos = msg; + } if (str_match(pos, WPA_EVENT_CONNECTED)) { int new_id = -1; - char *id; os_unsetenv("WPA_ID"); os_unsetenv("WPA_ID_STR"); os_unsetenv("WPA_CTRL_DIR"); @@@@ -1260,6 +1236,7 @@@@ } } + static void wpa_cli_recv_pending(struct wpa_ctrl *ctrl, int in_read, int action_monitor) { @@@@ -1279,7 +1256,7 @@@@ if (in_read && first) printf("\n"); first = 0; - wpa_cli_msg_cb(buf, 0); + printf("%s\n", buf); } } else { printf("Could not read pending message.\n"); @@@@ -1431,7 +1408,7 @@@@ history_set_pos(0); h = next_history(); while (h) { - const char *p = h->line; + char *p = h->line; while (*p == ' ' || *p == '\t') p++; if (os_strncasecmp(p, "pa", 2) == 0 || @@@@ -1439,8 +1416,8 @@@@ os_strncasecmp(p, "n", 1)) { h = remove_history(where_history()); if (h) { - os_free(__UNCONST(h->line)); - os_free(__UNCONST(h->data)); + os_free(h->line); + os_free(h->data); os_free(h); } h = current_history(); Only in /usr/src/dist/wpa/wpa_supplicant/: wpa_cli.c.orig @