LVM2/tools lvmcmdline.c

LVM2/tools lvmcmdline.c

[zkabelac]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	zkabelac@sourceware.org	2011-08-04 14:11:29

Modified files:
	tools          : lvmcmdline.c 

Log message:
	Remove self assigment which has no effect
	
	Just a tiny code cleanup found by analyzer.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/lvmcmdline.c.diff?cvsroot=lvm2&r1=1.144&r2=1.145

--- LVM2/tools/lvmcmdline.c	2011/06/27 23:43:04	1.144
+++ LVM2/tools/lvmcmdline.c	2011/08/04 14:11:28	1.145
@@ -274,8 +274,7 @@
 		if (i < 0) {
 			return 0;
 		} else if (i == 7) {
-			/* sectors */
-			v = v;
+			/* v is already in sectors */
 		} else if (i == 6) {
 			/* bytes */
 			v_tmp = (uint64_t) v;

LVM2/tools lvmcmdline.c

[agk]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	agk@sourceware.org	2012-04-11 12:49:10

Modified files:
	tools          : lvmcmdline.c 

Log message:
	spacing

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/lvmcmdline.c.diff?cvsroot=lvm2&r1=1.155&r2=1.156

--- LVM2/tools/lvmcmdline.c	2012/03/16 10:43:52	1.155
+++ LVM2/tools/lvmcmdline.c	2012/04/11 12:49:10	1.156
@@ -99,7 +99,7 @@
 	struct arg_value_group_list *current_group;
 	struct arg_values *av;
 
-	dm_list_iterate_items(current_group, &cmd->arg_value_groups)  {
+	dm_list_iterate_items(current_group, &cmd->arg_value_groups) {
 		av = current_group->arg_values;
 		if (grouped_arg_count(av, a))
 			return grouped_arg_int_value(av, a, def);

LVM2/tools lvmcmdline.c

[zkabelac]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	zkabelac@sourceware.org	2012-03-01 21:17:29

Modified files:
	tools          : lvmcmdline.c 

Log message:
	Log sys errors

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/lvmcmdline.c.diff?cvsroot=lvm2&r1=1.151&r2=1.152

--- LVM2/tools/lvmcmdline.c	2012/02/15 15:18:44	1.151
+++ LVM2/tools/lvmcmdline.c	2012/03/01 21:17:29	1.152
@@ -1390,9 +1390,12 @@
 	if (is_static() && strcmp(base, "lvm.static") &&
 	    path_exists(LVM_SHARED_PATH) &&
 	    !getenv("LVM_DID_EXEC")) {
-		setenv("LVM_DID_EXEC", base, 1);
-		execvp(LVM_SHARED_PATH, argv);
-		unsetenv("LVM_DID_EXEC");
+		if (setenv("LVM_DID_EXEC", base, 1))
+			log_sys_error("setenv", "LVM_DID_EXEC");
+		if (execvp(LVM_SHARED_PATH, argv) == -1)
+			log_sys_error("execvp", "LVM_SHARED_PATH");
+		if (unsetenv("LVM_DID_EXEC"))
+			log_sys_error("unsetenv", "LVM_DID_EXEC");
 	}
 
 	/* "version" command is simple enough so it doesn't need any complex init */

LVM2/tools lvmcmdline.c

[zkabelac]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	zkabelac@sourceware.org	2012-02-13 12:07:51

Modified files:
	tools          : lvmcmdline.c 

Log message:
	Handle all succefull values from open()

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/lvmcmdline.c.diff?cvsroot=lvm2&r1=1.149&r2=1.150

--- LVM2/tools/lvmcmdline.c	2011/12/08 21:24:10	1.149
+++ LVM2/tools/lvmcmdline.c	2012/02/13 12:07:51	1.150
@@ -1149,7 +1149,7 @@
 
 	snprintf(buf, sizeof(buf), DEFAULT_PROC_DIR "/%u/cmdline", pid);
 	/* FIXME Use generic read code. */
-	if ((fd = open(buf, O_RDONLY)) > 0) {
+	if ((fd = open(buf, O_RDONLY)) >= 0) {
 		if ((n = read(fd, _proc_cmdline, sizeof(_proc_cmdline) - 1)) < 0) {
 			log_sys_error("read", buf);
 			n = 0;

LVM2/tools lvmcmdline.c

[zkabelac]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	zkabelac@sourceware.org	2011-08-04 14:54:48

Modified files:
	tools          : lvmcmdline.c 

Log message:
	Add 'empty' command
	
	Using empty command ';' here makes the code look nicer.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/lvmcmdline.c.diff?cvsroot=lvm2&r1=1.145&r2=1.146

--- LVM2/tools/lvmcmdline.c	2011/08/04 14:11:28	1.145
+++ LVM2/tools/lvmcmdline.c	2011/08/04 14:54:48	1.146
@@ -275,6 +275,7 @@
 			return 0;
 		} else if (i == 7) {
 			/* v is already in sectors */
+			;
 		} else if (i == 6) {
 			/* bytes */
 			v_tmp = (uint64_t) v;

LVM2/tools lvmcmdline.c

[prajnoha]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	prajnoha@sourceware.org	2011-04-22 12:07:36

Modified files:
	tools          : lvmcmdline.c 

Log message:
	Use common udev_get_dev_dir() to get current device directory managed by udev.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/lvmcmdline.c.diff?cvsroot=lvm2&r1=1.140&r2=1.141

--- LVM2/tools/lvmcmdline.c	2011/04/22 12:05:33	1.140
+++ LVM2/tools/lvmcmdline.c	2011/04/22 12:07:35	1.141
@@ -955,13 +955,11 @@
 static int _set_udev_checking(struct cmd_context *cmd)
 {
 #ifdef UDEV_SYNC_SUPPORT
-	struct udev *udev;
 	const char *udev_dev_dir;
 	size_t udev_dev_dir_len;
 	int dirs_diff;
 
-	if (!(udev = udev_new()) ||
-	    !(udev_dev_dir = udev_get_dev_path(udev)) ||
+	if (!(udev_dev_dir = udev_get_dev_dir()) ||
 	    !*udev_dev_dir) {
 		log_error("Could not get udev dev path.");
 		return 0;
@@ -988,7 +986,6 @@
 		init_udev_checking(0);
 	}
 
-	udev_unref(udev);
 #endif
 	return 1;
 }

LVM2/tools lvmcmdline.c

[zkabelac]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	zkabelac@sourceware.org	2011-01-13 15:00:29

Modified files:
	tools          : lvmcmdline.c 

Log message:
	Do not log backtrace for correctly processed command

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/lvmcmdline.c.diff?cvsroot=lvm2&r1=1.136&r2=1.137

--- LVM2/tools/lvmcmdline.c	2010/12/20 13:59:52	1.136
+++ LVM2/tools/lvmcmdline.c	2011/01/13 15:00:29	1.137
@@ -1095,8 +1095,11 @@
 	if (!_set_udev_checking(cmd))
 		goto_out;
 
-	if ((ret = _process_common_commands(cmd)))
-		goto_out;
+	if ((ret = _process_common_commands(cmd))) {
+		if (ret != ECMD_PROCESSED)
+			stack;
+		goto out;
+	}
 
 	if (cmd->metadata_read_only &&
 	    !(cmd->command->flags & PERMITTED_READ_ONLY)) {

LVM2/tools lvmcmdline.c

[zkabelac]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	zkabelac@sourceware.org	2010-12-20 13:59:52

Modified files:
	tools          : lvmcmdline.c 

Log message:
	Remove dead store in lvm_run_command
	
	Variable 'ret' is not read before its next assignment.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/lvmcmdline.c.diff?cvsroot=lvm2&r1=1.135&r2=1.136

--- LVM2/tools/lvmcmdline.c	2010/12/20 13:16:30	1.135
+++ LVM2/tools/lvmcmdline.c	2010/12/20 13:59:52	1.136
@@ -1064,8 +1064,8 @@
 	set_cmd_name(cmd->command->name);
 
 	if (arg_count(cmd, config_ARG))
-		if ((ret = override_config_tree_from_string(cmd,
-			     arg_str_value(cmd, config_ARG, "")))) {
+		if (override_config_tree_from_string(cmd,
+		    arg_str_value(cmd, config_ARG, ""))) {
 			ret = EINVALID_CMD_LINE;
 			goto_out;
 		}

LVM2/tools lvmcmdline.c

[zkabelac]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	zkabelac@sourceware.org	2010-12-20 13:16:30

Modified files:
	tools          : lvmcmdline.c 

Log message:
	Test return value from read() and close() for an error.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/lvmcmdline.c.diff?cvsroot=lvm2&r1=1.134&r2=1.135

--- LVM2/tools/lvmcmdline.c	2010/11/30 11:53:33	1.134
+++ LVM2/tools/lvmcmdline.c	2010/12/20 13:16:30	1.135
@@ -1191,15 +1191,19 @@
 {
 	static char _proc_cmdline[32];
 	char buf[256];
-	int fd;
+	int fd, n = 0;
 
 	snprintf(buf, sizeof(buf), DEFAULT_PROC_DIR "/%u/cmdline", pid);
+	/* FIXME Use generic read code. */
 	if ((fd = open(buf, O_RDONLY)) > 0) {
-		read(fd, _proc_cmdline, sizeof(_proc_cmdline) - 1);
-		_proc_cmdline[sizeof(_proc_cmdline) - 1] = '\0';
-		close(fd);
-	} else
-		_proc_cmdline[0] = '\0';
+		if ((n = read(fd, _proc_cmdline, sizeof(_proc_cmdline) - 1)) < 0) {
+			log_sys_error("read", buf);
+			n = 0;
+		}
+		if (close(fd))
+			log_sys_error("close", buf);
+	}
+	_proc_cmdline[n] = '\0';
 
 	return _proc_cmdline;
 }

LVM2/tools lvmcmdline.c

[zkabelac]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	zkabelac@sourceware.org	2010-11-29 11:14:33

Modified files:
	tools          : lvmcmdline.c 

Log message:
	Remove dead assignment in lvm2_main
	
	'alias' is not read again in this code path.
	Also 'alias' is already equal to 0 in this place.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/lvmcmdline.c.diff?cvsroot=lvm2&r1=1.132&r2=1.133

--- LVM2/tools/lvmcmdline.c	2010/11/24 09:53:31	1.132
+++ LVM2/tools/lvmcmdline.c	2010/11/29 11:14:33	1.133
@@ -1442,7 +1442,6 @@
 		if (!alias) {
 			argv++;
 			argc--;
-			alias = 0;
 		}
 		if (!argc) {
 			log_error("Falling back to LVM1 tools, but no "

LVM2/tools lvmcmdline.c

[prajnoha]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	prajnoha@sourceware.org	2010-04-30 13:47:11

Modified files:
	tools          : lvmcmdline.c 

Log message:
	And be consistent with return code as well (previous commit).

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/lvmcmdline.c.diff?cvsroot=lvm2&r1=1.119&r2=1.120

--- LVM2/tools/lvmcmdline.c	2010/04/30 13:28:44	1.119
+++ LVM2/tools/lvmcmdline.c	2010/04/30 13:47:11	1.120
@@ -1366,7 +1366,7 @@
 
 	/* "version" command is simple enough so it doesn't need any complex init */
 	if (!alias && argc > 1 && !strcmp(argv[1], "version"))
-		return version(NULL, argc, argv);
+		return lvm_return_code(version(NULL, argc, argv));
 
 	if (!(cmd = init_lvm()))
 		return -1;

LVM2/tools lvmcmdline.c

[prajnoha]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	prajnoha@sourceware.org	2010-04-30 13:28:45

Modified files:
	tools          : lvmcmdline.c 

Log message:
	Don't run any complex initialisation for the "version" lvm2 command.
	
	We can use it even in read-only environment where a try to initialise
	file-based locking fails (not to mention other processing related with
	lvm2 init). Simply, we want to output the version only, nothing else.
	And this should always work.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/lvmcmdline.c.diff?cvsroot=lvm2&r1=1.118&r2=1.119

--- LVM2/tools/lvmcmdline.c	2010/04/29 01:38:14	1.118
+++ LVM2/tools/lvmcmdline.c	2010/04/30 13:28:44	1.119
@@ -1364,6 +1364,10 @@
 		unsetenv("LVM_DID_EXEC");
 	}
 
+	/* "version" command is simple enough so it doesn't need any complex init */
+	if (!alias && argc > 1 && !strcmp(argv[1], "version"))
+		return version(NULL, argc, argv);
+
 	if (!(cmd = init_lvm()))
 		return -1;
 

LVM2/tools lvmcmdline.c

[prajnoha]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	prajnoha@sourceware.org	2010-03-23 15:13:03

Modified files:
	tools          : lvmcmdline.c 

Log message:
	UDEV_SYNC_SUPPORT, not UDEV_SYNC!

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/lvmcmdline.c.diff?cvsroot=lvm2&r1=1.116&r2=1.117

--- LVM2/tools/lvmcmdline.c	2010/03/23 14:43:19	1.116
+++ LVM2/tools/lvmcmdline.c	2010/03/23 15:13:03	1.117
@@ -919,7 +919,7 @@
 
 static int _set_udev_checking(struct cmd_context *cmd)
 {
-#ifdef UDEV_SYNC
+#ifdef UDEV_SYNC_SUPPORT
 	struct udev *udev;
 	const char *udev_dev_dir;
 	size_t udev_dev_dir_len;

LVM2/tools lvmcmdline.c

[zkabelac]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	zkabelac@sourceware.org	2010-01-21 13:41:39

Modified files:
	tools          : lvmcmdline.c 

Log message:
	Reset released pointer and counters.
	
	DSO is currently not dl_close-ing pluing during it is unregister handling,
	so clear structure and related counter, so there are no memory problems.
	Futher fixes are needed.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/lvmcmdline.c.diff?cvsroot=lvm2&r1=1.111&r2=1.112

--- LVM2/tools/lvmcmdline.c	2010/01/11 19:19:17	1.111
+++ LVM2/tools/lvmcmdline.c	2010/01/21 13:41:39	1.112
@@ -1213,6 +1213,10 @@
 		dm_free(_cmdline.commands[i].valid_args);
 
 	dm_free(_cmdline.commands);
+
+	_cmdline.commands = NULL;
+	_cmdline.num_commands = 0;
+	_cmdline.commands_size = 0;
 }
 
 void lvm_fin(struct cmd_context *cmd)

LVM2/tools lvmcmdline.c

[wysochanski]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	wysochanski@sourceware.org	2009-07-27 21:01:36

Modified files:
	tools          : lvmcmdline.c 

Log message:
	Refactor _override_settings to take the new config string as input.
	
	We will re-use this function from liblvm.
	
	Signed-off-by: Dave Wysochanski <dwysocha@redhat.com>

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/lvmcmdline.c.diff?cvsroot=lvm2&r1=1.102&r2=1.103

--- LVM2/tools/lvmcmdline.c	2009/07/16 00:37:00	1.102
+++ LVM2/tools/lvmcmdline.c	2009/07/27 21:01:36	1.103
@@ -887,9 +887,9 @@
 	return ret;
 }
 
-static int _override_settings(struct cmd_context *cmd)
+static int _override_settings(struct cmd_context *cmd, const char *config_settings)
 {
-	if (!(cmd->cft_override = create_config_tree_from_string(cmd, arg_str_value(cmd, config_ARG, "")))) {
+	if (!(cmd->cft_override = create_config_tree_from_string(cmd, config_settings))) {
 		log_error("Failed to set overridden configuration entries.");
 		return EINVALID_CMD_LINE;
 	}
@@ -986,7 +986,8 @@
 	set_cmd_name(cmd->command->name);
 
 	if (arg_count(cmd, config_ARG))
-		if ((ret = _override_settings(cmd)))
+		if ((ret = _override_settings(cmd,
+				arg_str_value(cmd, config_ARG, ""))))
 			goto_out;
 
 	if (arg_count(cmd, config_ARG) || !cmd->config_valid || config_files_changed(cmd)) {

LVM2/tools lvmcmdline.c

[wysochanski]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	wysochanski@sourceware.org	2009-07-07 01:51:00

Modified files:
	tools          : lvmcmdline.c 

Log message:
	Fix compile warning in lvmcmdline.c - use C99 PRIu64 for uint64_t.
	
	Author: Dave Wysochanski <dwysocha@redhat.com>

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/lvmcmdline.c.diff?cvsroot=lvm2&r1=1.97&r2=1.98

--- LVM2/tools/lvmcmdline.c	2009/07/06 19:13:26	1.97
+++ LVM2/tools/lvmcmdline.c	2009/07/07 01:51:00	1.98
@@ -285,7 +285,7 @@
 			if (adjustment) {
 				v_tmp += (512 - adjustment);
 				log_error("Size is not a multiple of 512. "
-					  "Try using %lu or %lu.",
+					  "Try using %"PRIu64" or %"PRIu64".",
 					  v_tmp - 512, v_tmp);
 				return 0;
 			}

LVM2/tools lvmcmdline.c

[mbroz]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	mbroz@sourceware.org	2009-04-02 14:59:48

Modified files:
	tools          : lvmcmdline.c 

Log message:
	Do not use pointer from released memory pool (cmd->cmd_line).

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/lvmcmdline.c.diff?cvsroot=lvm2&r1=1.94&r2=1.95

--- LVM2/tools/lvmcmdline.c	2009/02/22 22:11:59	1.94
+++ LVM2/tools/lvmcmdline.c	2009/04/02 14:59:48	1.95
@@ -1026,16 +1026,16 @@
 	cmd->current_settings = cmd->default_settings;
 	_apply_settings(cmd);
 
-	/*
-	 * free off any memory the command used.
-	 */
-	dm_pool_empty(cmd->mem);
-
 	if (ret == EINVALID_CMD_LINE && !_cmdline.interactive)
 		_short_usage(cmd->command->name);
 
 	log_debug("Completed: %s", cmd->cmd_line);
 
+	/*
+	 * free off any memory the command used.
+	 */
+	dm_pool_empty(cmd->mem);
+
 	return ret;
 }
 

LVM2/tools lvmcmdline.c

[wysochanski]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	wysochanski@sourceware.org	2008-12-11 03:34:43

Modified files:
	tools          : lvmcmdline.c 

Log message:
	Remove redundant init_msg_prefix() and init_cmd_name().
	
	This is very obvious - _init_logging() makes the identical init_msg_prefix()
	and init_cmd_name() calls with cmd->default_settings so these calls are
	clearly redundant after calling create_toolcontext().

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/lvmcmdline.c.diff?cvsroot=lvm2&r1=1.84&r2=1.85

--- LVM2/tools/lvmcmdline.c	2008/12/11 03:34:12	1.84
+++ LVM2/tools/lvmcmdline.c	2008/12/11 03:34:43	1.85
@@ -1094,9 +1094,6 @@
 	init_full_scan_done(0);
 	init_mirror_in_sync(0);
 
-	init_msg_prefix(cmd->default_settings.msg_prefix);
-	init_cmd_name(cmd->default_settings.cmd_name);
-
 	cmd->fmt = arg_ptr_value(cmd, metadatatype_ARG,
 				 cmd->current_settings.fmt);
 

LVM2/tools lvmcmdline.c

[wysochanski]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	wysochanski@sourceware.org	2008-12-11 03:31:10

Modified files:
	tools          : lvmcmdline.c 

Log message:
	Remove handles_missing_pvs assignment after call to create_toolcontext().
	
	This variable is set at the top of create_toolcontext() to 0.
	Nothing later in create_toolcontext() changes the value.
	In init_lvm(), nothing between create_toolcontext() call and this assignment
	changes the value.  Thus, the assignment is redundant.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/lvmcmdline.c.diff?cvsroot=lvm2&r1=1.79&r2=1.80

--- LVM2/tools/lvmcmdline.c	2008/12/11 03:30:20	1.79
+++ LVM2/tools/lvmcmdline.c	2008/12/11 03:31:10	1.80
@@ -1105,7 +1105,6 @@
 
 	cmd->fmt = arg_ptr_value(cmd, metadatatype_ARG,
 				 cmd->current_settings.fmt);
-	cmd->handles_missing_pvs = 0;
 
 	return cmd;
 }

LVM2/tools lvmcmdline.c

[wysochanski]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	wysochanski@sourceware.org	2008-12-11 03:28:54

Modified files:
	tools          : lvmcmdline.c 

Log message:
	Replace _apply_settings() after create_toolcontext() with equivalent inline.
	
	Subsequent patches will refactor / remove each of these lines, as many of
	them are redundant when called immediately after create_toolcontext().

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/lvmcmdline.c.diff?cvsroot=lvm2&r1=1.76&r2=1.77

--- LVM2/tools/lvmcmdline.c	2008/12/07 04:27:57	1.76
+++ LVM2/tools/lvmcmdline.c	2008/12/11 03:28:54	1.77
@@ -1091,7 +1091,23 @@
 	if (!(cmd = create_toolcontext(_cmdline.the_args, is_static, 0)))
 		return_NULL;
 
-	_apply_settings(cmd);
+	init_debug(cmd->current_settings.debug);
+	init_verbose(cmd->current_settings.verbose + VERBOSE_BASE_LEVEL);
+	init_test(cmd->current_settings.test);
+	init_full_scan_done(0);
+	init_mirror_in_sync(0);
+
+	init_msg_prefix(cmd->default_settings.msg_prefix);
+	init_cmd_name(cmd->default_settings.cmd_name);
+
+	archive_enable(cmd, cmd->current_settings.archive);
+	backup_enable(cmd, cmd->current_settings.backup);
+
+	set_activation(cmd->current_settings.activation);
+
+	cmd->fmt = arg_ptr_value(cmd, metadatatype_ARG,
+				 cmd->current_settings.fmt);
+	cmd->handles_missing_pvs = 0;
 
 	return cmd;
 }

LVM2/tools lvmcmdline.c

[zkabelac]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	zkabelac@sourceware.org	2008-11-18 10:13:23

Modified files:
	tools          : lvmcmdline.c 

Log message:
	fix missing const char*

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/lvmcmdline.c.diff?cvsroot=lvm2&r1=1.74&r2=1.75

--- LVM2/tools/lvmcmdline.c	2008/11/12 09:53:33	1.74
+++ LVM2/tools/lvmcmdline.c	2008/11/18 10:13:23	1.75
@@ -1218,7 +1218,7 @@
 
 int lvm2_main(int argc, char **argv, unsigned is_static)
 {
-	char *base;
+	const char *base;
 	int ret, alias = 0;
 	struct cmd_context *cmd;
 

LVM2/tools lvmcmdline.c

[zkabelac]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	zkabelac@sourceware.org	2008-11-12 09:49:06

Modified files:
	tools          : lvmcmdline.c 

Log message:
	minor compiler warning fix for function declaration prototype

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/lvmcmdline.c.diff?cvsroot=lvm2&r1=1.72&r2=1.73

--- LVM2/tools/lvmcmdline.c	2008/11/03 22:14:30	1.72
+++ LVM2/tools/lvmcmdline.c	2008/11/12 09:49:06	1.73
@@ -1210,7 +1210,7 @@
 	log_sys_error("execvp", path);
 }
 
-static void _nonroot_warning()
+static void _nonroot_warning(void)
 {
 	if (getuid() || geteuid())
 		log_warn("WARNING: Running as a non-root user. Functionality may be unavailable.");

LVM2/tools lvmcmdline.c

[agk]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	agk@sourceware.org	2008-09-19 07:11:55

Modified files:
	tools          : lvmcmdline.c 

Log message:
	rename var

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/lvmcmdline.c.diff?cvsroot=lvm2&r1=1.70&r2=1.71

--- LVM2/tools/lvmcmdline.c	2008/09/19 06:42:00	1.70
+++ LVM2/tools/lvmcmdline.c	2008/09/19 07:11:54	1.71
@@ -710,10 +710,10 @@
 	cmd->current_settings.archive = arg_int_value(cmd, autobackup_ARG, cmd->current_settings.archive);
 	cmd->current_settings.backup = arg_int_value(cmd, autobackup_ARG, cmd->current_settings.backup);
 	cmd->current_settings.cache_vgmetadata = cmd->command->flags & CACHE_VGMETADATA ? 1 : 0;
-	cmd->partial_activate = 0;
+	cmd->partial_activation = 0;
 
 	if (arg_count(cmd, partial_ARG)) {
-		cmd->partial_activate = 1;
+		cmd->partial_activation = 1;
 		log_print("Partial mode. Incomplete volume groups will "
 			  "be activated read-only.");
 	}

LVM2/tools lvmcmdline.c

[meyering]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	meyering@sourceware.org	2007-09-21 18:43:55

Modified files:
	tools          : lvmcmdline.c 

Log message:
	Don't emit a trailing newline to stderr.
	
	* tools/lvmcmdline.c (_short_usage): Remove trailing "\n".
	Spotted by Alasdair G. Kergon.
	
	Author: Jim Meyering <jim@meyering.net>

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/lvmcmdline.c.diff?cvsroot=lvm2&r1=1.51&r2=1.52

--- LVM2/tools/lvmcmdline.c	2007/09/21 18:06:56	1.51
+++ LVM2/tools/lvmcmdline.c	2007/09/21 18:43:55	1.52
@@ -468,7 +468,7 @@
 
 static void _short_usage(const char *name)
 {
-	log_error("Run `%s --help' for more information.\n", name);
+	log_error("Run `%s --help' for more information.", name);
 }
 
 static void _usage(const char *name)

LVM2/tools lvmcmdline.c

[agk]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	agk@sourceware.org	2004-11-12 15:58:26

Modified files:
	tools          : lvmcmdline.c 

Log message:
	Also accept y/n with -ae.

Patches:
http://sources.redhat.com/cgi-bin/cvsweb.cgi/LVM2/tools/lvmcmdline.c.diff?cvsroot=lvm2&r1=1.16&r2=1.17

LVM2/tools lvmcmdline.c

[agk]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	agk@sourceware.org	2004-06-29 13:27:20

Modified files:
	tools          : lvmcmdline.c 

Log message:
	Add initrd-lvm to list of recognised argv[0]s.  [pld-linux]

Patches:
http://sources.redhat.com/cgi-bin/cvsweb.cgi/LVM2/tools/lvmcmdline.c.diff?cvsroot=lvm2&r1=1.15&r2=1.16

LVM2/tools lvmcmdline.c

[agk]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	agk@sourceware.org	2004-04-05 16:24:18

Modified files:
	tools          : lvmcmdline.c 

Log message:
	accept argv[0] lvm.static

Patches:
http://sources.redhat.com/cgi-bin/cvsweb.cgi/LVM2/tools/lvmcmdline.c.diff?cvsroot=lvm2&r1=1.5&r2=1.6

LVM2/tools lvmcmdline.c

[agk]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	agk@sourceware.org	2004-03-26 12:21:26

Modified files:
	tools          : lvmcmdline.c 

Log message:
	Add cmdlib code.

Patches:
http://sources.redhat.com/cgi-bin/cvsweb.cgi/LVM2/tools/lvmcmdline.c.diff?cvsroot=lvm2&r1=1.2&r2=1.3