[commits] [batctl] master: Merge branch 'next' (a395164)

postmaster at open-mesh.org postmaster at open-mesh.org
Sat Dec 15 09:22:13 CET 2012


Repository : ssh://git@open-mesh.org/batctl

On branch  : master

>---------------------------------------------------------------

commit a3951645f11a48d55731eecf8b21defb2f5d5375
Merge: 2e962f1 1932d4e
Author: Marek Lindner <lindner_marek at yahoo.de>
Date:   Sat Dec 15 16:21:49 2012 +0800

    Merge branch 'next'



>---------------------------------------------------------------

a3951645f11a48d55731eecf8b21defb2f5d5375
 bisect_iv.c  |   34 ++++++++++++-------------
 debug.c      |   36 +++++++++++++-------------
 debugfs.c    |    2 +-
 functions.c  |   18 ++++++-------
 ioctl.c      |   10 ++++----
 main.c       |   68 +++++++++++++++++++++++++------------------------
 ping.c       |   30 +++++++++++-----------
 sys.c        |   80 +++++++++++++++++++++++++++++-----------------------------
 tcpdump.c    |   34 ++++++++++++-------------
 traceroute.c |   28 ++++++++++----------
 translate.c  |    2 +-
 vis.c        |    8 +++---
 12 files changed, 176 insertions(+), 174 deletions(-)

diff --cc sys.c
index e4112b7,d7cc1c0..f628363
--- a/sys.c
+++ b/sys.c
@@@ -154,10 -153,9 +154,10 @@@ static int print_interfaces(char *mesh_
  		line_ptr = NULL;
  
  		snprintf(path_buff, PATH_BUFF_LEN, SYS_IFACE_STATUS_FMT, iface_dir->d_name);
 +		path_buff[PATH_BUFF_LEN - 1] = '\0';
  		res = read_file("", path_buff, USE_READ_BUFF | SILENCE_ERRORS, 0, 0, 0);
  		if (res != EXIT_SUCCESS) {
- 			printf("<error reading status>\n");
+ 			fprintf(stderr, "<error reading status>\n");
  			continue;
  		}
  
@@@ -222,10 -219,9 +222,10 @@@ int interface(char *mesh_iface, int arg
  
  		if (!file_exists(path_buff)) {
  			snprintf(path_buff, PATH_BUFF_LEN, SYS_IFACE_DIR, argv[i]);
 +			path_buff[PATH_BUFF_LEN - 1] = '\0';
  
  			if (!file_exists(path_buff)) {
- 				printf("Error - interface does not exist: %s\n", argv[i]);
+ 				fprintf(stderr, "Error - interface does not exist: %s\n", argv[i]);
  				continue;
  			}
  



More information about the commits mailing list