Applied non-integer configs patch from Mark Vitek, fixed some ununitialized

vars warnings


git-svn-id: svn://svn.savannah.nongnu.org/lash/trunk@19 1de19dc7-4e3f-0410-a61d-eddf686bf0b7

Makefile.am

@@ -11,7 +11,7 @@ buildcheck:
 	cd $(top_srcdir) && ./autogen.sh --no-conf
 	mkdir -p $(top_srcdir)/buildcheck
 	cd $(top_srcdir)/buildcheck && \
-          CFLAGS="$$CFLAGS -Werror -Wall -pedantic -Wno-switch" \
+          CFLAGS="$$CFLAGS -std=c99 -Werror -Wall -pedantic -Wno-switch" \
           ../configure \
             --disable-debug \
             --disable-gtk \

clients/control/lash_control.c

@@ -399,12 +399,12 @@ deal_with_command(lash_control_t * control, char *command)
 static void
 deal_with_events(lash_control_t * control)
 {
-	lash_event_t *event;
-	const char *event_str;
-	project_t *project;
-	client_t *client;
+	lash_event_t *event = NULL;
+	const char *event_str = NULL;
+	project_t *project = NULL;
+	client_t *client = NULL;
 	uuid_t client_id;
-	lash_list_t *node, *clnode;
+	lash_list_t *node = NULL, *clnode = NULL;
 
 	if (lash_get_pending_event_count(control->client) == 0)
 		return;

lash/internal.h

@@ -42,7 +42,7 @@ typedef struct _lash_comm lash_comm_t;
 
 enum LASH_Internal_Client_Flag
   {
-    LASH_Saved              =  0x01000000,  /* client has been saved */
+    LASH_Saved              =  0x01000000  /* client has been saved */
   };
 
 struct _lash_config

lashd/conn_mgr.c

@@ -18,14 +18,15 @@
  *   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#define _GNU_SOURCE /* addrinfo */
+
 #include <sys/types.h>
 #include <sys/socket.h>
+#include <netdb.h>
 #include <netinet/in.h>
 #include <string.h>
 #include <arpa/inet.h>
 #include <pthread.h>
-#include <time.h>
-#include <netdb.h>
 
 #include <lash/lash.h>
 #include <lash/internal_headers.h>
@@ -380,8 +381,8 @@ conn_mgr_accept_connection(conn_mgr_t * conn_mgr)
 {
 	conn_t *conn;
 
-	//struct sockaddr_storage ss;
-	//size_t ss_len;
+	/*struct sockaddr_storage ss;
+	size_t ss_len;*/
 	int err;
 
 	conn = conn_new();

lashd/project.c

@@ -433,19 +433,32 @@ project_move(project_t * project, const char *new_dir)
 	client_t *client = NULL;
 	char *esc_proj_dir = NULL;
 	char *esc_new_proj_dir = NULL;
-
+	char *esc_new_proj_bak_dir = NULL;
+	DIR *dir = NULL;
+	
 	if (strcmp(new_dir, project->directory) == 0)
 		return;
+	
+	esc_proj_dir = escape_file_name(project->directory);
+	esc_new_proj_dir = escape_file_name(new_dir);
 
 	/* Check to be sure directory is acceptable
 	 * FIXME: thorough enough error checking? */
-	DIR *dir = opendir(new_dir);
+	dir = opendir(esc_new_proj_dir);
 
 	if (dir != NULL) {
 		fprintf(stderr,
-				"Warning: directory %s exists, files may be overwritten.\n",
-				new_dir);
+				"Warning: directory %s exists, it will be moved to %s.lashbak.\n",
+				new_dir, new_dir);
 		closedir(dir);
+		esc_new_proj_bak_dir = (char*)calloc(strlen(esc_new_proj_dir) + 8, sizeof(char));
+		strncpy(esc_new_proj_bak_dir, esc_new_proj_dir, strlen(esc_new_proj_dir + 8));
+		strncat(esc_new_proj_bak_dir, ".lashbak", strlen(esc_new_proj_dir + 8));
+		if (rename(esc_new_proj_dir, esc_new_proj_bak_dir)) {
+			fprintf(stderr, "Unable to backup directory %s to %s.lashbak (%s)",
+				new_dir, new_dir, strerror(errno));
+			return;
+		}
 	} else if (dir == NULL && errno == ENOTDIR) {
 		fprintf(stderr,
 				"Can not move project directory to %s - exists but is not a directory\n",
@@ -464,8 +477,7 @@ project_move(project_t * project, const char *new_dir)
 	}
 
 	/* move the directory */
-	esc_proj_dir = escape_file_name(project->directory);
-	esc_new_proj_dir = escape_file_name(new_dir);
+	
 
 	if (rename(esc_proj_dir, esc_new_proj_dir)) {
 		fprintf(stderr, "Unable to move project directory to %s (%s)",
@@ -754,8 +766,9 @@ project_t *
 project_new_from_xml(server_t * server, xmlDocPtr doc)
 {
 	xmlNodePtr projectnode, xmlnode;
-	xmlChar *content;
-
+	xmlChar *content = NULL;
+	project_t *project = NULL;
+	
 	for (projectnode = doc->children; projectnode;
 		 projectnode = projectnode->next)
 		if (projectnode->type == XML_ELEMENT_NODE
@@ -767,8 +780,6 @@ project_new_from_xml(server_t * server, xmlDocPtr doc)
 		return NULL;
 	}
 
-	project_t *project;
-
 	project = project_new(server);
 
 	for (xmlnode = projectnode->children; xmlnode; xmlnode = xmlnode->next) {

lashd/server.c

@@ -553,9 +553,9 @@ server_event_client_disconnect(server_t * server, server_event_t * event)
 void
 server_event_client_event(server_t * server, server_event_t * server_event)
 {
-	lash_event_t *event;
-	project_t *project;
-	client_t *client, *ref_client;
+	lash_event_t *event = NULL;
+	project_t *project = NULL;
+	client_t *client = NULL, *ref_client = NULL;
 
 	event = server_event_take_lash_event(server_event);
 

lashd/store.c

@@ -295,11 +295,11 @@ store_write_config(store_t * store, const lash_config_t * config)
 		return 1;
 	}
 
-	if (size > 0) {
+	if (lash_config_get_value_size(config) > 0) {
 		written =
 			write(config_file, lash_config_get_value(config),
 				  lash_config_get_value_size(config));
-		if (written == -1 || written < sizeof(size)) {
+		if (written == -1 || written < lash_config_get_value_size(config)) {
 			fprintf(stderr,
 					"%s: error writing to config file '%s' in store '%s'!: %s\n",
 					__FUNCTION__, lash_config_get_key(config), store->dir,
@@ -541,10 +541,10 @@ lash_config_t *
 store_get_config(store_t * store, const char *key)
 {
 	uint32_t size;
-	void *value;
+	void *value = NULL;
 	size_t value_size;
 	int config_file;
-	lash_config_t *config;
+	lash_config_t *config = NULL;
 	ssize_t err;
 
 	config = store_get_unstored_config(store, key);
@@ -575,7 +575,7 @@ store_get_config(store_t * store, const char *key)
 		value = lash_malloc(value_size);
 
 		err = read(config_file, value, value_size);
-		if (err == -1 || err < sizeof(size)) {
+		if (err == -1 || err < value_size) {
 			fprintf(stderr,
 					"%s: error reading value size in config file '%s': %s\n",
 					__FUNCTION__, store_get_config_filename(store, key),

liblash/comm_buffer.c

@@ -18,6 +18,8 @@
  *   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#define _GNU_SOURCE /* strdup */
+
 #include <stdint.h>
 #include <string.h>
 #include <stdlib.h>

liblash/socket.c

@@ -18,6 +18,8 @@
  *   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#define _POSIX_SOURCE /* addrinfo */
+
 #include <stdint.h>
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -38,9 +40,9 @@ extern int h_errno;
 int
 lash_sendall(int socket, const void *buf, size_t buf_size, int flags)
 {
-	int sent, err;
+	int err;
 	char *new_buf;
-	size_t new_buf_size;
+	size_t sent, new_buf_size;
 	uint32_t *iptr;
 
 	/* create the new buffer */
@@ -93,9 +95,9 @@ lash_sendall(int socket, const void *buf, size_t buf_size, int flags)
 int
 lash_recvall(int socket, void **buf_ptr, size_t * buf_size_ptr, int flags)
 {
-	int err, recvd;
+	int err;
 	char *buf = NULL;
-	size_t buf_size;
+	size_t recvd, buf_size;
 	uint32_t *iptr;
 	size_t packet_size;
 
@@ -157,7 +159,7 @@ lash_open_socket(int *sockptr, const char *host, const char *service)
 	struct addrinfo hints;
 	struct addrinfo *addrs;
 	struct addrinfo *addr;
-	int sock;
+	int sock = 0;
 	int err;
 	int connected = 0;