r136 - in devmapper/trunk: . dmsetup

[Bastian Blank]

Author: waldi
Date: Sat Aug 13 10:40:53 2005
New Revision: 136

Modified:
   devmapper/trunk/   (props changed)
   devmapper/trunk/VERSION
   devmapper/trunk/WHATS_NEW
   devmapper/trunk/dmsetup/dmsetup.c
Log:
Merge /devmapper/upstream/current (1.01.04).


Modified: devmapper/trunk/VERSION
==============================================================================
--- devmapper/trunk/VERSION	(original)
+++ devmapper/trunk/VERSION	Sat Aug 13 10:40:53 2005
@@ -1 +1 @@
-1.01.03 (2005-06-13)
+1.01.04 (2005-08-02)

Modified: devmapper/trunk/WHATS_NEW
==============================================================================
--- devmapper/trunk/WHATS_NEW	(original)
+++ devmapper/trunk/WHATS_NEW	Sat Aug 13 10:40:53 2005
@@ -1,3 +1,7 @@
+Version 1.01.04 - 2 Aug 2005
+=============================
+  Fix dmsetup ls -j and status --target with empty table.
+
 Version 1.01.03 - 13 Jun 2005
 =============================
   Use matchpathcon mode parameter.

Modified: devmapper/trunk/dmsetup/dmsetup.c
==============================================================================
--- devmapper/trunk/dmsetup/dmsetup.c	(original)
+++ devmapper/trunk/dmsetup/dmsetup.c	Sat Aug 13 10:40:53 2005
@@ -757,13 +757,16 @@
 	if (!dm_task_run(dmt))
 		goto out;
 
+	if (!name)
+		name = (char *) dm_task_get_name(dmt);
+
 	/* Fetch targets and print 'em */
 	do {
 		next = dm_get_next_target(dmt, next, &start, &length,
 					  &target_type, &params);
 		/* Skip if target type doesn't match */
-		if (_switches[TARGET_ARG] && target_type &&
-		    strcmp(target_type, _target))
+		if (_switches[TARGET_ARG] &&
+		    (!target_type || strcmp(target_type, _target)))
 			continue;
 		if (ls_only) {
 			if (!_switches[EXEC_ARG] || !_command ||