[svn-commits] tzafrir: branch tools/tzafrir/sysfs r8707 - /tools/team/tzafrir/sysfs/

[SVN commits to the Digium repositories]

Author: tzafrir
Date: Thu May 27 10:15:14 2010
New Revision: 8707

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=8707
Log:
dahdi_cfg: usage message and such

Modified:
    tools/team/tzafrir/sysfs/dahdi_cfg.c

Modified: tools/team/tzafrir/sysfs/dahdi_cfg.c
URL: http://svnview.digium.com/svn/dahdi/tools/team/tzafrir/sysfs/dahdi_cfg.c?view=diff&rev=8707&r1=8706&r2=8707
==============================================================================
--- tools/team/tzafrir/sysfs/dahdi_cfg.c (original)
+++ tools/team/tzafrir/sysfs/dahdi_cfg.c Thu May 27 10:15:14 2010
@@ -338,6 +338,10 @@
 	char		tmppath[PATH_MAX];
 	int		span;
 
+	/* Check legacy (no dial_byname) case */
+	if (sscanf(span_string, "%i", &span) == 1) {
+		return span;
+	}
 	dahdi_copy_string(tmppath, span_string, sizeof(tmppath));
 	str_replace(tmppath, '!', '/');
 	snprintf(path, sizeof(path), "/dev/dahdi/%s", tmppath);
@@ -404,7 +408,7 @@
 	span = span_string2num(realargs[0]);
 	if (span == 0) {
 		if (debug & DEBUG_APPLY) {
-			printf("Skipping failed span '%s'\n", realargs[0]);
+			printf("Skipping bad span '%s'\n", realargs[0]);
 		}
 		return 0;
 	} else if (span < 0) {
@@ -1401,7 +1405,7 @@
 			if(showpaths) {
 				y = chan_indexes[x];
 				snprintf(channame, sizeof(channame), "%s!%02d",
-					(chan_pathnames[x]) ? chan_pathnames[x] : "<NOPOOL>", y);
+					(chan_pathnames[x]) ? chan_pathnames[x] : "<NONAME>", y);
 			} else {
 				y = x;
 				snprintf(channame, sizeof(channame), "%02d", y);
@@ -1521,6 +1525,8 @@
 		"  -d [level]        -- Generate debugging output. (Default level is 1.)\n"
 		"  -f                -- Always reconfigure every channel\n"
 		"  -h                -- Generate this help statement\n"
+		"  -k                -- Keep going. Don't abort on first error.\n"
+		"  -p                -- Show paths (for dial byname)\n"
 		"  -s                -- Shutdown spans only\n"
 		"  -t                -- Test mode only, do not apply\n"
 		"  -v                -- Verbose (more -v's means more verbose)\n"