===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tmux.c,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- src/usr.bin/tmux/tmux.c	2012/01/21 08:40:09	1.108
+++ src/usr.bin/tmux/tmux.c	2012/05/25 08:28:10	1.109
@@ -1,4 +1,4 @@
-/* $OpenBSD: tmux.c,v 1.108 2012/01/21 08:40:09 nicm Exp $ */
+/* $OpenBSD: tmux.c,v 1.109 2012/05/25 08:28:10 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -73,7 +73,7 @@
 	log_close();
 	if (debug_level > 0) {
 		xasprintf(&path, "tmux-%s-%ld.log", name, (long) getpid());
-		log_open_file(debug_level, path);
+		log_open(debug_level, path);
 		xfree(path);
 	}
 }
@@ -294,8 +294,6 @@
 	if (shell_cmd != NULL && argc != 0)
 		usage();
 
-	log_open_tty(debug_level);
-
 	if (!(flags & IDENTIFY_UTF8)) {
 		/*
 		 * If the user has set whichever of LC_ALL, LC_CTYPE or LANG
@@ -379,7 +377,7 @@
 		/* -L or default set. */
 		if (label != NULL) {
 			if ((path = makesocketpath(label)) == NULL) {
-				log_warn("can't create socket");
+				fprintf(stderr, "can't create socket\n");
 				exit(1);
 			}
 		}