Subject | Hash | Author | Date (UTC) |
---|---|---|---|
releasing version 0.20 | b6547b684543ce4dca051366714065d6482e7bd5 | joeyh | 2006-12-23 20:58:47 |
* Typo fixes from Ralf Wildenhues. | 7b0da07eeeb8007494f92391b03f5128ed3e5cd7 | joeyh | 2006-11-26 19:49:18 |
releasing version 0.19 | 0a72631e595507348b6a5518eb7b586b3a5c2bf6 | joeyh | 2006-11-12 03:03:46 |
add XS-Vcs-Svn field | a7cc6680fb9f2ce1f4f785d09d23e1274c3972b9 | joeyh | 2006-10-04 17:26:48 |
releasing version 0.18 | 978f10e76bee0b53e4b6f578de0371a73e09cadc | joeyh | 2006-09-14 19:15:29 |
* spongs: Output to stdout if no file is specified, useful in a pipeline such as: cvs diff | sponge | patch -R -p0 Closes: #387501 | 08be7808b13547b5632f9a98470ca62b1f55aeee | joeyh | 2006-09-14 19:13:26 |
* mispipe.docbook: Typo. Closes: #386756 | 14f2f08540f4bb1490ef532619ccb3d948a0d5f9 | joeyh | 2006-09-09 22:47:07 |
releasing version 0.17 | 03924314a9abd0dd135f5fbc99197050b9abd15c | joeyh | 2006-09-08 00:49:51 |
* Add mispipe, contributed by Nathanael Nerode. Pipes together two commands, returning the exit status of the first. | 7b6c6008e0e3f2a88c974cf8bea0545037626d2c | joeyh | 2006-09-08 00:33:43 |
* Add missing \n to sponge usage. Closes: #383944 | 79881487962d274e73b475458b6a1847789ca562 | joeyh | 2006-08-20 22:37:20 |
releasing version 0.16 | fba236a29d973360915b168a83f50e54e1ff1c75 | joeyh | 2006-08-19 19:30:56 |
support lastlog format | 4efc12865588023b906c51cd688c6f67941051f6 | joeyh | 2006-08-19 19:26:59 |
* Change the default ts format to include the month and day, for consistency with syslog format. * Add -r switch to ts, which makes it convert existing timestamps in the input into relative times, such as "15m2s ago". | de4c5fde3d86ae278e71b102f640b110f361bda2 | joeyh | 2006-08-18 05:46:19 |
releasing version 0.15 | c7f258b2fbdcae9dc20d83dde6252dc8579962a5 | joeyh | 2006-07-26 02:51:02 |
* vidir, vipe: Use /usr/bin/editor if it's present, and EDITOR and VISUAL arn't set, to comply with Debian policy. For portability, fall back to vi if there's no /usr/bin/editor. Closes: #378623 | 92f6884638abdda0fd8140379fcfc2ed36c37679 | joeyh | 2006-07-26 02:46:50 |
* combine: Man page improvements, to clarify even more that order does matter and that the operations are not commutative. Closes: #361123 * combine: The behavior of "or" was fairly strange if lines were repeated in a file. Changed behavior to just print all lines from both files, even if this means printing dups. Not sure I like this behavior either, but it's consistent with the very useful behaviors of "and" and "not". | 11a51513fff47e8756ecdc1f24703b540c309eb5 | joeyh | 2006-07-26 02:40:28 |
* vidir: Don't abort if it sees an empty or all-whitespace line. * vidir: If just a filename is removed and the number is left, treat this the same as removing the whole line, and delete the file, instead of trying to rename the file to "". * vidir: Remove the periods after the item numbers. * vidir: Man page improvements. Closes: #378122 | 3095ba17495d0f1871900fcc1c87e6efe9f55f18 | joeyh | 2006-07-13 21:10:34 |
* Remove notes about potential tools from README, moved to wiki. | 987dac354dbcb7367addc40d69c51bc61897f9ee | joeyh | 2006-07-13 16:22:44 |
releasing version 0.14 | 3de0317294bad0e765c97f6f5486f200ae2f6a33 | joeyh | 2006-07-12 17:36:43 |
releasing version 0.13 | 7d38acc76a549d06e2d90bae6bb814173799c461 | joeyh | 2006-07-12 16:55:15 |
File | Lines added | Lines deleted |
---|---|---|
debian/changelog | 4 | 2 |
ifdata.c | 19 | 1 |
ifdata.docbook | 16 | 0 |
File debian/changelog changed (mode: 100644) (index 712cb0e..c245223) | |||
1 | moreutils (0.20) UNRELEASED; urgency=low | ||
1 | moreutils (0.20) unstable; urgency=low | ||
2 | 2 | ||
3 | 3 | * Typo fixes from Ralf Wildenhues. | * Typo fixes from Ralf Wildenhues. |
4 | * ifdata: Add -bips and -bops options contributed by André Appel, | ||
5 | to print the number of bytes of incoming/outgoing traffic per second. | ||
4 | 6 | ||
5 | -- Joey Hess <joeyh@debian.org> Sun, 26 Nov 2006 14:48:57 -0500 | ||
7 | -- Joey Hess <joeyh@debian.org> Sat, 23 Dec 2006 15:55:45 -0500 | ||
6 | 8 | ||
7 | 9 | moreutils (0.19) unstable; urgency=low | moreutils (0.19) unstable; urgency=low |
8 | 10 |
File ifdata.c changed (mode: 100644) (index c0ee4ae..2fd4b51) | |||
... | ... | enum { | |
42 | 42 | DO_SOUTMULTICAST, | DO_SOUTMULTICAST, |
43 | 43 | DO_PNETWORK, | DO_PNETWORK, |
44 | 44 | DO_PHWADDRESS, | DO_PHWADDRESS, |
45 | DO_BIPS, | ||
46 | DO_BOPS | ||
45 | 47 | }; | }; |
46 | 48 | ||
47 | 49 | struct if_stat { | struct if_stat { |
... | ... | const struct { | |
309 | 311 | { "-sox", DO_SOUTCOLLS, 1, "Print # of out collisions" }, | { "-sox", DO_SOUTCOLLS, 1, "Print # of out collisions" }, |
310 | 312 | { "-soc", DO_SOUTCARRIER, 1, "Print # of out carrier loss" }, | { "-soc", DO_SOUTCARRIER, 1, "Print # of out carrier loss" }, |
311 | 313 | { "-som", DO_SOUTMULTICAST, 1, "Print # of out multicast" }, | { "-som", DO_SOUTMULTICAST, 1, "Print # of out multicast" }, |
314 | { "-bips",DO_BIPS, 1, "Print # of incoming bytes per second" }, | ||
315 | { "-bops",DO_BOPS, 1, "Print # of outgoing bytes per second" }, | ||
312 | 316 | }; | }; |
313 | 317 | ||
314 | 318 | void usage(const char *name) { | void usage(const char *name) { |
... | ... | static void print_addr(struct sockaddr *sadr) { | |
335 | 339 | print_quad(sadr); | print_quad(sadr); |
336 | 340 | } | } |
337 | 341 | ||
338 | struct if_stat *ifstats; | ||
342 | struct if_stat *ifstats, *ifstats2 = NULL; | ||
339 | 343 | ||
340 | 344 | void please_do(int ndo, int *todo, const char *ifname) { | void please_do(int ndo, int *todo, const char *ifname) { |
341 | 345 | int i; | int i; |
... | ... | void please_do(int ndo, int *todo, const char *ifname) { | |
435 | 439 | case DO_SOUTMULTICAST: | case DO_SOUTMULTICAST: |
436 | 440 | printf("%llu",ifstats->out_multicast); | printf("%llu",ifstats->out_multicast); |
437 | 441 | break; | break; |
442 | case DO_BIPS: | ||
443 | if (ifstats2 == NULL) { | ||
444 | sleep(1); | ||
445 | ifstats2 = get_stats(ifname); | ||
446 | } | ||
447 | printf("%llu", ifstats2->in_bytes-ifstats->in_bytes); | ||
448 | break; | ||
449 | case DO_BOPS: | ||
450 | if (ifstats2 == NULL) { | ||
451 | sleep(1); | ||
452 | ifstats2 = get_stats(ifname); | ||
453 | } | ||
454 | printf("%llu", ifstats2->out_bytes-ifstats->out_bytes); | ||
455 | break; | ||
438 | 456 | case DO_SOUTALL: | case DO_SOUTALL: |
439 | 457 | printf("%llu %llu %llu %llu %llu %llu %llu %llu", | printf("%llu %llu %llu %llu %llu %llu %llu %llu", |
440 | 458 | ifstats->out_bytes, ifstats->out_packets, | ifstats->out_bytes, ifstats->out_packets, |
File ifdata.docbook changed (mode: 100644) (index 60ce90d..5f2837f) | |||
... | ... | with this program; if not, write to the Free Software Foundation, Inc., | |
285 | 285 | packets.</para> | packets.</para> |
286 | 286 | </listitem> | </listitem> |
287 | 287 | </varlistentry> | </varlistentry> |
288 | |||
289 | <varlistentry> | ||
290 | <term><option>-bips</option></term> | ||
291 | <listitem> | ||
292 | <para>Prints the number of bytes of | ||
293 | incoming traffic measured in one second.</para> | ||
294 | </listitem> | ||
295 | </varlistentry> | ||
296 | |||
297 | <varlistentry> | ||
298 | <term><option>-bops</option></term> | ||
299 | <listitem> | ||
300 | <para>Prints the number of bytes of | ||
301 | outgoing traffic measured in one second.</para> | ||
302 | </listitem> | ||
303 | </varlistentry> | ||
288 | 304 | ||
289 | 305 | </variablelist> | </variablelist> |
290 | 306 | </refsect1> | </refsect1> |