Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Import upstream snapshot from SVN r2608

  • Loading branch information...
commit b0169484ebba96ff9579b5ebcc527bf9d9582ca2 1 parent 7216c39
Romain Francoise orebokech authored
Showing with 2,423 additions and 1,286 deletions.
  1. +5 −6 Makefile.am
  2. +243 −177 Makefile.in
  3. +11 −1 NOTES
  4. +12 −1 TODO
  5. +97 −49 aclocal.m4
  6. +28 −9 cfg.c
  7. +2 −1  cmd-capture-pane.c
  8. +5 −3 cmd-choose-client.c
  9. +5 −4 cmd-list-clients.c
  10. +53 −47 cmd-list-panes.c
  11. +27 −22 cmd-list-sessions.c
  12. +50 −25 cmd-list-windows.c
  13. +2 −4 cmd-pipe-pane.c
  14. +8 −4 cmd-refresh-client.c
  15. +8 −6 cmd-split-window.c
  16. +14 −4 cmd-switch-client.c
  17. +2 −4 cmd-unbind-key.c
  18. +6 −8 colour.c
  19. +6 −1 compat.h
  20. +5 −2 compat/asprintf.c
  21. +182 −0 compat/b64_ntop.c
  22. +626 −645 configure
  23. +56 −22 configure.ac
  24. +1 −2  etc/compile
  25. +119 −103 etc/config.guess
  26. +107 −52 etc/config.sub
  27. +1 −3 etc/depcomp
  28. +1 −3 etc/missing
  29. +1 −1  examples/screen-keys.conf
  30. +352 −0 format.c
  31. +4 −2 input-keys.c
  32. +6 −2 mode-key.c
  33. +13 −2 options-table.c
  34. +126 −0 osdep-dragonfly.c
  35. +3 −4 osdep-sunos.c
  36. +3 −1 server-client.c
  37. +19 −3 server-fn.c
  38. +4 −4 server-window.c
  39. +12 −5 session.c
  40. +4 −2 status.c
  41. +154 −44 tmux.1
  42. +4 −2 tmux.c
  43. +25 −1 tmux.h
  44. +7 −1 tty.c
  45. +4 −4 window.c
11 Makefile.am
View
@@ -1,4 +1,4 @@
-# $Id: Makefile.am 2556 2011-07-09 13:45:24Z tcunha $
+# $Id: Makefile.am 2592 2011-09-21 16:32:31Z tcunha $
# Obvious program stuff.
bin_PROGRAMS = tmux
@@ -43,11 +43,6 @@ CPPFLAGS += -I. -I- -I/usr/local/include
endif
endif
-# Set flags for static.
-if IS_STATIC
-LDFLAGS += -static
-endif
-
# Set flags for Solaris.
if IS_SUNOS
CPPFLAGS += -D_XPG4_2 -D__EXTENSIONS__ -D_POSIX_PTHREAD_SEMANTICS
@@ -141,6 +136,7 @@ dist_tmux_SOURCES = \
cmd.c \
colour.c \
environ.c \
+ format.c \
grid-utf8.c \
grid-view.c \
grid.c \
@@ -226,6 +222,9 @@ endif
if NO_STRTONUM
nodist_tmux_SOURCES += compat/strtonum.c
endif
+if NO_B64_NTOP
+nodist_tmux_SOURCES += compat/b64_ntop.c
+endif
# Update SF web site.
upload-index.html: update-index.html
420 Makefile.in
View
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -15,12 +15,13 @@
@SET_MAKE@
-# $Id: Makefile.am 2556 2011-07-09 13:45:24Z tcunha $
+# $Id: Makefile.am 2592 2011-09-21 16:32:31Z tcunha $
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -58,30 +59,28 @@ bin_PROGRAMS = tmux$(EXEEXT)
@IS_DEBUG_TRUE@@IS_GCC4_TRUE@@IS_GCC_TRUE@am__append_6 = -Wno-pointer-sign
@IS_GCC4_FALSE@@IS_GCC_TRUE@am__append_7 = -I. -I- -I/usr/local/include
-# Set flags for static.
-@IS_STATIC_TRUE@am__append_8 = -static
-
# Set flags for Solaris.
-@IS_SUNOS_TRUE@am__append_9 = -D_XPG4_2 -D__EXTENSIONS__ -D_POSIX_PTHREAD_SEMANTICS
+@IS_SUNOS_TRUE@am__append_8 = -D_XPG4_2 -D__EXTENSIONS__ -D_POSIX_PTHREAD_SEMANTICS
# Set flags for Sun CC.
-@IS_SUNCC_TRUE@am__append_10 = -erroff=E_EMPTY_DECLARATION
+@IS_SUNCC_TRUE@am__append_9 = -erroff=E_EMPTY_DECLARATION
# Pile in all the compat/ stuff that is needed.
-@NO_FORKPTY_TRUE@am__append_11 = compat/forkpty-@PLATFORM@.c
-@NO_IMSG_TRUE@am__append_12 = compat/imsg.c compat/imsg-buffer.c
-@NO_CLOSEFROM_TRUE@am__append_13 = compat/closefrom.c
-@NO_DAEMON_TRUE@am__append_14 = compat/daemon.c
-@NO_SETENV_TRUE@am__append_15 = compat/setenv.c
-@NO_STRLCAT_TRUE@am__append_16 = compat/strlcat.c
-@NO_STRLCPY_TRUE@am__append_17 = compat/strlcpy.c
-@NO_ASPRINTF_TRUE@am__append_18 = compat/asprintf.c
-@NO_FGETLN_TRUE@am__append_19 = compat/fgetln.c
-@NO_GETOPT_TRUE@am__append_20 = compat/getopt.c
-@NO_STRCASESTR_TRUE@am__append_21 = compat/strcasestr.c
-@NO_STRSEP_TRUE@am__append_22 = compat/strsep.c
-@NO_VIS_TRUE@am__append_23 = compat/vis.c compat/unvis.c
-@NO_STRTONUM_TRUE@am__append_24 = compat/strtonum.c
+@NO_FORKPTY_TRUE@am__append_10 = compat/forkpty-@PLATFORM@.c
+@NO_IMSG_TRUE@am__append_11 = compat/imsg.c compat/imsg-buffer.c
+@NO_CLOSEFROM_TRUE@am__append_12 = compat/closefrom.c
+@NO_DAEMON_TRUE@am__append_13 = compat/daemon.c
+@NO_SETENV_TRUE@am__append_14 = compat/setenv.c
+@NO_STRLCAT_TRUE@am__append_15 = compat/strlcat.c
+@NO_STRLCPY_TRUE@am__append_16 = compat/strlcpy.c
+@NO_ASPRINTF_TRUE@am__append_17 = compat/asprintf.c
+@NO_FGETLN_TRUE@am__append_18 = compat/fgetln.c
+@NO_GETOPT_TRUE@am__append_19 = compat/getopt.c
+@NO_STRCASESTR_TRUE@am__append_20 = compat/strcasestr.c
+@NO_STRSEP_TRUE@am__append_21 = compat/strsep.c
+@NO_VIS_TRUE@am__append_22 = compat/vis.c compat/unvis.c
+@NO_STRTONUM_TRUE@am__append_23 = compat/strtonum.c
+@NO_B64_NTOP_TRUE@am__append_24 = compat/b64_ntop.c
subdir = .
DIST_COMMON = $(am__configure_deps) $(dist_man1_MANS) \
$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
@@ -93,10 +92,10 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
-mkinstalldirs = $(SHELL) $(install_sh) -d
+mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"
-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
PROGRAMS = $(bin_PROGRAMS)
dist_tmux_OBJECTS = arguments.$(OBJEXT) attributes.$(OBJEXT) \
cfg.$(OBJEXT) client.$(OBJEXT) clock.$(OBJEXT) \
@@ -137,15 +136,15 @@ dist_tmux_OBJECTS = arguments.$(OBJEXT) attributes.$(OBJEXT) \
cmd-swap-pane.$(OBJEXT) cmd-swap-window.$(OBJEXT) \
cmd-switch-client.$(OBJEXT) cmd-unbind-key.$(OBJEXT) \
cmd-unlink-window.$(OBJEXT) cmd.$(OBJEXT) colour.$(OBJEXT) \
- environ.$(OBJEXT) grid-utf8.$(OBJEXT) grid-view.$(OBJEXT) \
- grid.$(OBJEXT) input-keys.$(OBJEXT) input.$(OBJEXT) \
- job.$(OBJEXT) key-bindings.$(OBJEXT) key-string.$(OBJEXT) \
- layout-custom.$(OBJEXT) layout-set.$(OBJEXT) layout.$(OBJEXT) \
- log.$(OBJEXT) mode-key.$(OBJEXT) names.$(OBJEXT) \
- options-table.$(OBJEXT) options.$(OBJEXT) paste.$(OBJEXT) \
- resize.$(OBJEXT) screen-redraw.$(OBJEXT) \
- screen-write.$(OBJEXT) screen.$(OBJEXT) \
- server-client.$(OBJEXT) server-fn.$(OBJEXT) \
+ environ.$(OBJEXT) format.$(OBJEXT) grid-utf8.$(OBJEXT) \
+ grid-view.$(OBJEXT) grid.$(OBJEXT) input-keys.$(OBJEXT) \
+ input.$(OBJEXT) job.$(OBJEXT) key-bindings.$(OBJEXT) \
+ key-string.$(OBJEXT) layout-custom.$(OBJEXT) \
+ layout-set.$(OBJEXT) layout.$(OBJEXT) log.$(OBJEXT) \
+ mode-key.$(OBJEXT) names.$(OBJEXT) options-table.$(OBJEXT) \
+ options.$(OBJEXT) paste.$(OBJEXT) resize.$(OBJEXT) \
+ screen-redraw.$(OBJEXT) screen-write.$(OBJEXT) \
+ screen.$(OBJEXT) server-client.$(OBJEXT) server-fn.$(OBJEXT) \
server-window.$(OBJEXT) server.$(OBJEXT) session.$(OBJEXT) \
signal.$(OBJEXT) status.$(OBJEXT) tmux.$(OBJEXT) \
tty-acs.$(OBJEXT) tty-keys.$(OBJEXT) tty-term.$(OBJEXT) \
@@ -166,23 +165,46 @@ dist_tmux_OBJECTS = arguments.$(OBJEXT) attributes.$(OBJEXT) \
@NO_STRSEP_TRUE@am__objects_12 = strsep.$(OBJEXT)
@NO_VIS_TRUE@am__objects_13 = vis.$(OBJEXT) unvis.$(OBJEXT)
@NO_STRTONUM_TRUE@am__objects_14 = strtonum.$(OBJEXT)
+@NO_B64_NTOP_TRUE@am__objects_15 = b64_ntop.$(OBJEXT)
nodist_tmux_OBJECTS = osdep-@PLATFORM@.$(OBJEXT) $(am__objects_1) \
$(am__objects_2) $(am__objects_3) $(am__objects_4) \
$(am__objects_5) $(am__objects_6) $(am__objects_7) \
$(am__objects_8) $(am__objects_9) $(am__objects_10) \
$(am__objects_11) $(am__objects_12) $(am__objects_13) \
- $(am__objects_14)
+ $(am__objects_14) $(am__objects_15)
tmux_OBJECTS = $(dist_tmux_OBJECTS) $(nodist_tmux_OBJECTS)
tmux_LDADD = $(LDADD)
DEFAULT_INCLUDES = -I.@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/etc/depcomp
am__depfiles_maybe = depfiles
+am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(dist_tmux_SOURCES) $(nodist_tmux_SOURCES)
DIST_SOURCES = $(dist_tmux_SOURCES)
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
man1dir = $(mandir)/man1
NROFF = nroff
MANS = $(dist_man1_MANS)
@@ -192,9 +214,9 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
am__remove_distdir = \
- { test ! -d $(distdir) \
- || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
- && rm -fr $(distdir); }; }
+ { test ! -d "$(distdir)" \
+ || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+ && rm -fr "$(distdir)"; }; }
DIST_ARCHIVES = $(distdir).tar.gz
GZIP_ENV = --best
distuninstallcheck_listfiles = find . -type f -print
@@ -208,12 +230,12 @@ AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@ $(am__append_1) $(am__append_2) $(am__append_3) \
- $(am__append_6) $(am__append_10)
+ $(am__append_6) $(am__append_9)
CPP = @CPP@
# Preprocessor flags.
CPPFLAGS = @CPPFLAGS@ @XOPEN_DEFINES@ $(am__append_4) $(am__append_5) \
- $(am__append_7) $(am__append_9)
+ $(am__append_7) $(am__append_8)
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -228,7 +250,7 @@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@ $(am__append_8)
+LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
@@ -390,6 +412,7 @@ dist_tmux_SOURCES = \
cmd.c \
colour.c \
environ.c \
+ format.c \
grid-utf8.c \
grid-view.c \
grid.c \
@@ -431,12 +454,12 @@ dist_tmux_SOURCES = \
xmalloc.c \
xterm-keys.c
-nodist_tmux_SOURCES = osdep-@PLATFORM@.c $(am__append_11) \
- $(am__append_12) $(am__append_13) $(am__append_14) \
- $(am__append_15) $(am__append_16) $(am__append_17) \
- $(am__append_18) $(am__append_19) $(am__append_20) \
- $(am__append_21) $(am__append_22) $(am__append_23) \
- $(am__append_24)
+nodist_tmux_SOURCES = osdep-@PLATFORM@.c $(am__append_10) \
+ $(am__append_11) $(am__append_12) $(am__append_13) \
+ $(am__append_14) $(am__append_15) $(am__append_16) \
+ $(am__append_17) $(am__append_18) $(am__append_19) \
+ $(am__append_20) $(am__append_21) $(am__append_22) \
+ $(am__append_23) $(am__append_24)
all: all-am
.SUFFIXES:
@@ -447,15 +470,15 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
- echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
- cd $(srcdir) && $(AUTOMAKE) --foreign \
+ echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \
+ $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \
&& exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --foreign Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --foreign Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -471,29 +494,44 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENC
$(SHELL) ./config.status --recheck
$(top_srcdir)/configure: $(am__configure_deps)
- cd $(srcdir) && $(AUTOCONF)
+ $(am__cd) $(srcdir) && $(AUTOCONF)
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+ $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+$(am__aclocal_m4_deps):
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
- @list='$(bin_PROGRAMS)'; for p in $$list; do \
- p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
- if test -f $$p \
- ; then \
- f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
- echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
- $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
- else :; fi; \
- done
+ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed 's/$(EXEEXT)$$//' | \
+ while read p p1; do if test -f $$p; \
+ then echo "$$p"; echo "$$p"; else :; fi; \
+ done | \
+ sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+ sed 'N;N;N;s,\n, ,g' | \
+ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+ if ($$2 == $$4) files[d] = files[d] " " $$1; \
+ else { print "f", $$3 "/" $$4, $$1; } } \
+ END { for (d in files) print "f", d, files[d] }' | \
+ while read type dir files; do \
+ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+ test -z "$$files" || { \
+ echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+ $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+ } \
+ ; done
uninstall-binPROGRAMS:
@$(NORMAL_UNINSTALL)
- @list='$(bin_PROGRAMS)'; for p in $$list; do \
- f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
- echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
- rm -f "$(DESTDIR)$(bindir)/$$f"; \
- done
+ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+ files=`for p in $$list; do echo "$$p"; done | \
+ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+ -e 's/$$/$(EXEEXT)/' `; \
+ test -n "$$list" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(bindir)" && rm -f $$files
clean-binPROGRAMS:
-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
@@ -510,6 +548,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/arguments.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asprintf.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/attributes.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/b64_ntop.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cfg.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/client.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clock.Po@am__quote@
@@ -593,6 +632,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/environ.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fgetln.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/forkpty-@PLATFORM@.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/format.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/grid-utf8.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/grid-view.Po@am__quote@
@@ -648,286 +688,289 @@ distclean-compile:
.c.o:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
forkpty-@PLATFORM@.o: compat/forkpty-@PLATFORM@.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT forkpty-@PLATFORM@.o -MD -MP -MF $(DEPDIR)/forkpty-@PLATFORM@.Tpo -c -o forkpty-@PLATFORM@.o `test -f 'compat/forkpty-@PLATFORM@.c' || echo '$(srcdir)/'`compat/forkpty-@PLATFORM@.c
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/forkpty-@PLATFORM@.Tpo $(DEPDIR)/forkpty-@PLATFORM@.Po
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/forkpty-@PLATFORM@.Tpo $(DEPDIR)/forkpty-@PLATFORM@.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='compat/forkpty-@PLATFORM@.c' object='forkpty-@PLATFORM@.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o forkpty-@PLATFORM@.o `test -f 'compat/forkpty-@PLATFORM@.c' || echo '$(srcdir)/'`compat/forkpty-@PLATFORM@.c
forkpty-@PLATFORM@.obj: compat/forkpty-@PLATFORM@.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT forkpty-@PLATFORM@.obj -MD -MP -MF $(DEPDIR)/forkpty-@PLATFORM@.Tpo -c -o forkpty-@PLATFORM@.obj `if test -f 'compat/forkpty-@PLATFORM@.c'; then $(CYGPATH_W) 'compat/forkpty-@PLATFORM@.c'; else $(CYGPATH_W) '$(srcdir)/compat/forkpty-@PLATFORM@.c'; fi`
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/forkpty-@PLATFORM@.Tpo $(DEPDIR)/forkpty-@PLATFORM@.Po
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/forkpty-@PLATFORM@.Tpo $(DEPDIR)/forkpty-@PLATFORM@.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='compat/forkpty-@PLATFORM@.c' object='forkpty-@PLATFORM@.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o forkpty-@PLATFORM@.obj `if test -f 'compat/forkpty-@PLATFORM@.c'; then $(CYGPATH_W) 'compat/forkpty-@PLATFORM@.c'; else $(CYGPATH_W) '$(srcdir)/compat/forkpty-@PLATFORM@.c'; fi`
imsg.o: compat/imsg.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT imsg.o -MD -MP -MF $(DEPDIR)/imsg.Tpo -c -o imsg.o `test -f 'compat/imsg.c' || echo '$(srcdir)/'`compat/imsg.c
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/imsg.Tpo $(DEPDIR)/imsg.Po
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/imsg.Tpo $(DEPDIR)/imsg.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='compat/imsg.c' object='imsg.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o imsg.o `test -f 'compat/imsg.c' || echo '$(srcdir)/'`compat/imsg.c
imsg.obj: compat/imsg.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT imsg.obj -MD -MP -MF $(DEPDIR)/imsg.Tpo -c -o imsg.obj `if test -f 'compat/imsg.c'; then $(CYGPATH_W) 'compat/imsg.c'; else $(CYGPATH_W) '$(srcdir)/compat/imsg.c'; fi`
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/imsg.Tpo $(DEPDIR)/imsg.Po
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/imsg.Tpo $(DEPDIR)/imsg.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='compat/imsg.c' object='imsg.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o imsg.obj `if test -f 'compat/imsg.c'; then $(CYGPATH_W) 'compat/imsg.c'; else $(CYGPATH_W) '$(srcdir)/compat/imsg.c'; fi`
imsg-buffer.o: compat/imsg-buffer.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT imsg-buffer.o -MD -MP -MF $(DEPDIR)/imsg-buffer.Tpo -c -o imsg-buffer.o `test -f 'compat/imsg-buffer.c' || echo '$(srcdir)/'`compat/imsg-buffer.c
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/imsg-buffer.Tpo $(DEPDIR)/imsg-buffer.Po
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/imsg-buffer.Tpo $(DEPDIR)/imsg-buffer.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='compat/imsg-buffer.c' object='imsg-buffer.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o imsg-buffer.o `test -f 'compat/imsg-buffer.c' || echo '$(srcdir)/'`compat/imsg-buffer.c
imsg-buffer.obj: compat/imsg-buffer.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT imsg-buffer.obj -MD -MP -MF $(DEPDIR)/imsg-buffer.Tpo -c -o imsg-buffer.obj `if test -f 'compat/imsg-buffer.c'; then $(CYGPATH_W) 'compat/imsg-buffer.c'; else $(CYGPATH_W) '$(srcdir)/compat/imsg-buffer.c'; fi`
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/imsg-buffer.Tpo $(DEPDIR)/imsg-buffer.Po
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/imsg-buffer.Tpo $(DEPDIR)/imsg-buffer.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='compat/imsg-buffer.c' object='imsg-buffer.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o imsg-buffer.obj `if test -f 'compat/imsg-buffer.c'; then $(CYGPATH_W) 'compat/imsg-buffer.c'; else $(CYGPATH_W) '$(srcdir)/compat/imsg-buffer.c'; fi`
closefrom.o: compat/closefrom.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT closefrom.o -MD -MP -MF $(DEPDIR)/closefrom.Tpo -c -o closefrom.o `test -f 'compat/closefrom.c' || echo '$(srcdir)/'`compat/closefrom.c
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/closefrom.Tpo $(DEPDIR)/closefrom.Po
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/closefrom.Tpo $(DEPDIR)/closefrom.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='compat/closefrom.c' object='closefrom.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o closefrom.o `test -f 'compat/closefrom.c' || echo '$(srcdir)/'`compat/closefrom.c
closefrom.obj: compat/closefrom.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT closefrom.obj -MD -MP -MF $(DEPDIR)/closefrom.Tpo -c -o closefrom.obj `if test -f 'compat/closefrom.c'; then $(CYGPATH_W) 'compat/closefrom.c'; else $(CYGPATH_W) '$(srcdir)/compat/closefrom.c'; fi`
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/closefrom.Tpo $(DEPDIR)/closefrom.Po
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/closefrom.Tpo $(DEPDIR)/closefrom.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='compat/closefrom.c' object='closefrom.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o closefrom.obj `if test -f 'compat/closefrom.c'; then $(CYGPATH_W) 'compat/closefrom.c'; else $(CYGPATH_W) '$(srcdir)/compat/closefrom.c'; fi`
daemon.o: compat/daemon.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT daemon.o -MD -MP -MF $(DEPDIR)/daemon.Tpo -c -o daemon.o `test -f 'compat/daemon.c' || echo '$(srcdir)/'`compat/daemon.c
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/daemon.Tpo $(DEPDIR)/daemon.Po
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/daemon.Tpo $(DEPDIR)/daemon.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='compat/daemon.c' object='daemon.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o daemon.o `test -f 'compat/daemon.c' || echo '$(srcdir)/'`compat/daemon.c
daemon.obj: compat/daemon.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT daemon.obj -MD -MP -MF $(DEPDIR)/daemon.Tpo -c -o daemon.obj `if test -f 'compat/daemon.c'; then $(CYGPATH_W) 'compat/daemon.c'; else $(CYGPATH_W) '$(srcdir)/compat/daemon.c'; fi`
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/daemon.Tpo $(DEPDIR)/daemon.Po
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/daemon.Tpo $(DEPDIR)/daemon.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='compat/daemon.c' object='daemon.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o daemon.obj `if test -f 'compat/daemon.c'; then $(CYGPATH_W) 'compat/daemon.c'; else $(CYGPATH_W) '$(srcdir)/compat/daemon.c'; fi`
setenv.o: compat/setenv.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT setenv.o -MD -MP -MF $(DEPDIR)/setenv.Tpo -c -o setenv.o `test -f 'compat/setenv.c' || echo '$(srcdir)/'`compat/setenv.c
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/setenv.Tpo $(DEPDIR)/setenv.Po
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/setenv.Tpo $(DEPDIR)/setenv.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='compat/setenv.c' object='setenv.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o setenv.o `test -f 'compat/setenv.c' || echo '$(srcdir)/'`compat/setenv.c
setenv.obj: compat/setenv.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT setenv.obj -MD -MP -MF $(DEPDIR)/setenv.Tpo -c -o setenv.obj `if test -f 'compat/setenv.c'; then $(CYGPATH_W) 'compat/setenv.c'; else $(CYGPATH_W) '$(srcdir)/compat/setenv.c'; fi`
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/setenv.Tpo $(DEPDIR)/setenv.Po
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/setenv.Tpo $(DEPDIR)/setenv.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='compat/setenv.c' object='setenv.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o setenv.obj `if test -f 'compat/setenv.c'; then $(CYGPATH_W) 'compat/setenv.c'; else $(CYGPATH_W) '$(srcdir)/compat/setenv.c'; fi`
strlcat.o: compat/strlcat.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT strlcat.o -MD -MP -MF $(DEPDIR)/strlcat.Tpo -c -o strlcat.o `test -f 'compat/strlcat.c' || echo '$(srcdir)/'`compat/strlcat.c
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/strlcat.Tpo $(DEPDIR)/strlcat.Po
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/strlcat.Tpo $(DEPDIR)/strlcat.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='compat/strlcat.c' object='strlcat.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o strlcat.o `test -f 'compat/strlcat.c' || echo '$(srcdir)/'`compat/strlcat.c
strlcat.obj: compat/strlcat.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT strlcat.obj -MD -MP -MF $(DEPDIR)/strlcat.Tpo -c -o strlcat.obj `if test -f 'compat/strlcat.c'; then $(CYGPATH_W) 'compat/strlcat.c'; else $(CYGPATH_W) '$(srcdir)/compat/strlcat.c'; fi`
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/strlcat.Tpo $(DEPDIR)/strlcat.Po
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/strlcat.Tpo $(DEPDIR)/strlcat.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='compat/strlcat.c' object='strlcat.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o strlcat.obj `if test -f 'compat/strlcat.c'; then $(CYGPATH_W) 'compat/strlcat.c'; else $(CYGPATH_W) '$(srcdir)/compat/strlcat.c'; fi`
strlcpy.o: compat/strlcpy.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT strlcpy.o -MD -MP -MF $(DEPDIR)/strlcpy.Tpo -c -o strlcpy.o `test -f 'compat/strlcpy.c' || echo '$(srcdir)/'`compat/strlcpy.c
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/strlcpy.Tpo $(DEPDIR)/strlcpy.Po
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/strlcpy.Tpo $(DEPDIR)/strlcpy.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='compat/strlcpy.c' object='strlcpy.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o strlcpy.o `test -f 'compat/strlcpy.c' || echo '$(srcdir)/'`compat/strlcpy.c
strlcpy.obj: compat/strlcpy.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT strlcpy.obj -MD -MP -MF $(DEPDIR)/strlcpy.Tpo -c -o strlcpy.obj `if test -f 'compat/strlcpy.c'; then $(CYGPATH_W) 'compat/strlcpy.c'; else $(CYGPATH_W) '$(srcdir)/compat/strlcpy.c'; fi`
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/strlcpy.Tpo $(DEPDIR)/strlcpy.Po
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/strlcpy.Tpo $(DEPDIR)/strlcpy.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='compat/strlcpy.c' object='strlcpy.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o strlcpy.obj `if test -f 'compat/strlcpy.c'; then $(CYGPATH_W) 'compat/strlcpy.c'; else $(CYGPATH_W) '$(srcdir)/compat/strlcpy.c'; fi`
asprintf.o: compat/asprintf.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT asprintf.o -MD -MP -MF $(DEPDIR)/asprintf.Tpo -c -o asprintf.o `test -f 'compat/asprintf.c' || echo '$(srcdir)/'`compat/asprintf.c
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/asprintf.Tpo $(DEPDIR)/asprintf.Po
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/asprintf.Tpo $(DEPDIR)/asprintf.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='compat/asprintf.c' object='asprintf.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o asprintf.o `test -f 'compat/asprintf.c' || echo '$(srcdir)/'`compat/asprintf.c
asprintf.obj: compat/asprintf.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT asprintf.obj -MD -MP -MF $(DEPDIR)/asprintf.Tpo -c -o asprintf.obj `if test -f 'compat/asprintf.c'; then $(CYGPATH_W) 'compat/asprintf.c'; else $(CYGPATH_W) '$(srcdir)/compat/asprintf.c'; fi`
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/asprintf.Tpo $(DEPDIR)/asprintf.Po
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/asprintf.Tpo $(DEPDIR)/asprintf.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='compat/asprintf.c' object='asprintf.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o asprintf.obj `if test -f 'compat/asprintf.c'; then $(CYGPATH_W) 'compat/asprintf.c'; else $(CYGPATH_W) '$(srcdir)/compat/asprintf.c'; fi`
fgetln.o: compat/fgetln.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT fgetln.o -MD -MP -MF $(DEPDIR)/fgetln.Tpo -c -o fgetln.o `test -f 'compat/fgetln.c' || echo '$(srcdir)/'`compat/fgetln.c
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/fgetln.Tpo $(DEPDIR)/fgetln.Po
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/fgetln.Tpo $(DEPDIR)/fgetln.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='compat/fgetln.c' object='fgetln.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fgetln.o `test -f 'compat/fgetln.c' || echo '$(srcdir)/'`compat/fgetln.c
fgetln.obj: compat/fgetln.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT fgetln.obj -MD -MP -MF $(DEPDIR)/fgetln.Tpo -c -o fgetln.obj `if test -f 'compat/fgetln.c'; then $(CYGPATH_W) 'compat/fgetln.c'; else $(CYGPATH_W) '$(srcdir)/compat/fgetln.c'; fi`
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/fgetln.Tpo $(DEPDIR)/fgetln.Po
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/fgetln.Tpo $(DEPDIR)/fgetln.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='compat/fgetln.c' object='fgetln.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fgetln.obj `if test -f 'compat/fgetln.c'; then $(CYGPATH_W) 'compat/fgetln.c'; else $(CYGPATH_W) '$(srcdir)/compat/fgetln.c'; fi`
getopt.o: compat/getopt.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT getopt.o -MD -MP -MF $(DEPDIR)/getopt.Tpo -c -o getopt.o `test -f 'compat/getopt.c' || echo '$(srcdir)/'`compat/getopt.c
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/getopt.Tpo $(DEPDIR)/getopt.Po
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/getopt.Tpo $(DEPDIR)/getopt.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='compat/getopt.c' object='getopt.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o getopt.o `test -f 'compat/getopt.c' || echo '$(srcdir)/'`compat/getopt.c
getopt.obj: compat/getopt.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT getopt.obj -MD -MP -MF $(DEPDIR)/getopt.Tpo -c -o getopt.obj `if test -f 'compat/getopt.c'; then $(CYGPATH_W) 'compat/getopt.c'; else $(CYGPATH_W) '$(srcdir)/compat/getopt.c'; fi`
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/getopt.Tpo $(DEPDIR)/getopt.Po
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/getopt.Tpo $(DEPDIR)/getopt.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='compat/getopt.c' object='getopt.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o getopt.obj `if test -f 'compat/getopt.c'; then $(CYGPATH_W) 'compat/getopt.c'; else $(CYGPATH_W) '$(srcdir)/compat/getopt.c'; fi`
strcasestr.o: compat/strcasestr.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT strcasestr.o -MD -MP -MF $(DEPDIR)/strcasestr.Tpo -c -o strcasestr.o `test -f 'compat/strcasestr.c' || echo '$(srcdir)/'`compat/strcasestr.c
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/strcasestr.Tpo $(DEPDIR)/strcasestr.Po
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/strcasestr.Tpo $(DEPDIR)/strcasestr.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='compat/strcasestr.c' object='strcasestr.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o strcasestr.o `test -f 'compat/strcasestr.c' || echo '$(srcdir)/'`compat/strcasestr.c
strcasestr.obj: compat/strcasestr.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT strcasestr.obj -MD -MP -MF $(DEPDIR)/strcasestr.Tpo -c -o strcasestr.obj `if test -f 'compat/strcasestr.c'; then $(CYGPATH_W) 'compat/strcasestr.c'; else $(CYGPATH_W) '$(srcdir)/compat/strcasestr.c'; fi`
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/strcasestr.Tpo $(DEPDIR)/strcasestr.Po
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/strcasestr.Tpo $(DEPDIR)/strcasestr.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='compat/strcasestr.c' object='strcasestr.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o strcasestr.obj `if test -f 'compat/strcasestr.c'; then $(CYGPATH_W) 'compat/strcasestr.c'; else $(CYGPATH_W) '$(srcdir)/compat/strcasestr.c'; fi`
strsep.o: compat/strsep.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT strsep.o -MD -MP -MF $(DEPDIR)/strsep.Tpo -c -o strsep.o `test -f 'compat/strsep.c' || echo '$(srcdir)/'`compat/strsep.c
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/strsep.Tpo $(DEPDIR)/strsep.Po
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/strsep.Tpo $(DEPDIR)/strsep.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='compat/strsep.c' object='strsep.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o strsep.o `test -f 'compat/strsep.c' || echo '$(srcdir)/'`compat/strsep.c
strsep.obj: compat/strsep.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT strsep.obj -MD -MP -MF $(DEPDIR)/strsep.Tpo -c -o strsep.obj `if test -f 'compat/strsep.c'; then $(CYGPATH_W) 'compat/strsep.c'; else $(CYGPATH_W) '$(srcdir)/compat/strsep.c'; fi`
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/strsep.Tpo $(DEPDIR)/strsep.Po
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/strsep.Tpo $(DEPDIR)/strsep.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='compat/strsep.c' object='strsep.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o strsep.obj `if test -f 'compat/strsep.c'; then $(CYGPATH_W) 'compat/strsep.c'; else $(CYGPATH_W) '$(srcdir)/compat/strsep.c'; fi`
vis.o: compat/vis.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT vis.o -MD -MP -MF $(DEPDIR)/vis.Tpo -c -o vis.o `test -f 'compat/vis.c' || echo '$(srcdir)/'`compat/vis.c
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/vis.Tpo $(DEPDIR)/vis.Po
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/vis.Tpo $(DEPDIR)/vis.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='compat/vis.c' object='vis.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o vis.o `test -f 'compat/vis.c' || echo '$(srcdir)/'`compat/vis.c
vis.obj: compat/vis.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT vis.obj -MD -MP -MF $(DEPDIR)/vis.Tpo -c -o vis.obj `if test -f 'compat/vis.c'; then $(CYGPATH_W) 'compat/vis.c'; else $(CYGPATH_W) '$(srcdir)/compat/vis.c'; fi`
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/vis.Tpo $(DEPDIR)/vis.Po
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/vis.Tpo $(DEPDIR)/vis.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='compat/vis.c' object='vis.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o vis.obj `if test -f 'compat/vis.c'; then $(CYGPATH_W) 'compat/vis.c'; else $(CYGPATH_W) '$(srcdir)/compat/vis.c'; fi`
unvis.o: compat/unvis.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT unvis.o -MD -MP -MF $(DEPDIR)/unvis.Tpo -c -o unvis.o `test -f 'compat/unvis.c' || echo '$(srcdir)/'`compat/unvis.c
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/unvis.Tpo $(DEPDIR)/unvis.Po
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/unvis.Tpo $(DEPDIR)/unvis.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='compat/unvis.c' object='unvis.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o unvis.o `test -f 'compat/unvis.c' || echo '$(srcdir)/'`compat/unvis.c
unvis.obj: compat/unvis.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT unvis.obj -MD -MP -MF $(DEPDIR)/unvis.Tpo -c -o unvis.obj `if test -f 'compat/unvis.c'; then $(CYGPATH_W) 'compat/unvis.c'; else $(CYGPATH_W) '$(srcdir)/compat/unvis.c'; fi`
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/unvis.Tpo $(DEPDIR)/unvis.Po
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/unvis.Tpo $(DEPDIR)/unvis.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='compat/unvis.c' object='unvis.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o unvis.obj `if test -f 'compat/unvis.c'; then $(CYGPATH_W) 'compat/unvis.c'; else $(CYGPATH_W) '$(srcdir)/compat/unvis.c'; fi`
strtonum.o: compat/strtonum.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT strtonum.o -MD -MP -MF $(DEPDIR)/strtonum.Tpo -c -o strtonum.o `test -f 'compat/strtonum.c' || echo '$(srcdir)/'`compat/strtonum.c
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/strtonum.Tpo $(DEPDIR)/strtonum.Po
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/strtonum.Tpo $(DEPDIR)/strtonum.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='compat/strtonum.c' object='strtonum.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o strtonum.o `test -f 'compat/strtonum.c' || echo '$(srcdir)/'`compat/strtonum.c
strtonum.obj: compat/strtonum.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT strtonum.obj -MD -MP -MF $(DEPDIR)/strtonum.Tpo -c -o strtonum.obj `if test -f 'compat/strtonum.c'; then $(CYGPATH_W) 'compat/strtonum.c'; else $(CYGPATH_W) '$(srcdir)/compat/strtonum.c'; fi`
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/strtonum.Tpo $(DEPDIR)/strtonum.Po
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/strtonum.Tpo $(DEPDIR)/strtonum.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='compat/strtonum.c' object='strtonum.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o strtonum.obj `if test -f 'compat/strtonum.c'; then $(CYGPATH_W) 'compat/strtonum.c'; else $(CYGPATH_W) '$(srcdir)/compat/strtonum.c'; fi`
-install-man1: $(man1_MANS) $(man_MANS)
+
+b64_ntop.o: compat/b64_ntop.c
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT b64_ntop.o -MD -MP -MF $(DEPDIR)/b64_ntop.Tpo -c -o b64_ntop.o `test -f 'compat/b64_ntop.c' || echo '$(srcdir)/'`compat/b64_ntop.c
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/b64_ntop.Tpo $(DEPDIR)/b64_ntop.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='compat/b64_ntop.c' object='b64_ntop.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o b64_ntop.o `test -f 'compat/b64_ntop.c' || echo '$(srcdir)/'`compat/b64_ntop.c
+
+b64_ntop.obj: compat/b64_ntop.c
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT b64_ntop.obj -MD -MP -MF $(DEPDIR)/b64_ntop.Tpo -c -o b64_ntop.obj `if test -f 'compat/b64_ntop.c'; then $(CYGPATH_W) 'compat/b64_ntop.c'; else $(CYGPATH_W) '$(srcdir)/compat/b64_ntop.c'; fi`
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/b64_ntop.Tpo $(DEPDIR)/b64_ntop.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='compat/b64_ntop.c' object='b64_ntop.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o b64_ntop.obj `if test -f 'compat/b64_ntop.c'; then $(CYGPATH_W) 'compat/b64_ntop.c'; else $(CYGPATH_W) '$(srcdir)/compat/b64_ntop.c'; fi`
+install-man1: $(dist_man1_MANS)
@$(NORMAL_INSTALL)
test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
- @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
- for i in $$l2; do \
- case "$$i" in \
- *.1*) list="$$list $$i" ;; \
- esac; \
+ @list='$(dist_man1_MANS)'; test -n "$(man1dir)" || exit 0; \
+ { for i in $$list; do echo "$$i"; done; \
+ } | while read p; do \
+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; echo "$$p"; \
+ done | \
+ sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
+ sed 'N;N;s,\n, ,g' | { \
+ list=; while read file base inst; do \
+ if test "$$base" = "$$inst"; then list="$$list $$file"; else \
+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \
+ fi; \
done; \
- for i in $$list; do \
- if test -f $$i; then file=$$i; \
- else file=$(srcdir)/$$i; fi; \
- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
- case "$$ext" in \
- 1*) ;; \
- *) ext='1' ;; \
- esac; \
- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
- inst=`echo $$inst | sed -e 's/^.*\///'`; \
- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
- echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
- $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
- done
+ for i in $$list; do echo "$$i"; done | $(am__base_list) | \
+ while read files; do \
+ test -z "$$files" || { \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \
+ done; }
+
uninstall-man1:
@$(NORMAL_UNINSTALL)
- @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
- for i in $$l2; do \
- case "$$i" in \
- *.1*) list="$$list $$i" ;; \
- esac; \
- done; \
- for i in $$list; do \
- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
- case "$$ext" in \
- 1*) ;; \
- *) ext='1' ;; \
- esac; \
- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
- inst=`echo $$inst | sed -e 's/^.*\///'`; \
- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
- echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \
- rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
- done
+ @list='$(dist_man1_MANS)'; test -n "$(man1dir)" || exit 0; \
+ files=`{ for i in $$list; do echo "$$i"; done; \
+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
+ test -z "$$files" || { \
+ echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -941,7 +984,7 @@ tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
+ set x; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
@@ -949,29 +992,34 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
done | \
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
fi
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
+ $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -991,7 +1039,7 @@ distdir: $(DISTFILES)
else :; fi; \
else :; fi
$(am__remove_distdir)
- test -d $(distdir) || mkdir $(distdir)
+ test -d "$(distdir)" || mkdir "$(distdir)"
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
@@ -1007,25 +1055,30 @@ distdir: $(DISTFILES)
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$(top_distdir)" distdir="$(distdir)" \
dist-hook
- -find "$(distdir)" -type d ! -perm -755 \
+ -test -n "$(am__skip_mode_fix)" \
+ || find "$(distdir)" -type d ! -perm -755 \
-exec chmod u+rwx,go+rx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
- || chmod -R a+r $(distdir)
+ || chmod -R a+r "$(distdir)"
dist-gzip: distdir
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
$(am__remove_distdir)
@@ -1038,6 +1091,10 @@ dist-lzma: distdir
tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
$(am__remove_distdir)
+dist-xz: distdir
+ tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
+ $(am__remove_distdir)
+
dist-tarZ: distdir
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__remove_distdir)
@@ -1061,15 +1118,17 @@ dist dist-all: distdir
distcheck: dist
case '$(DIST_ARCHIVES)' in \
*.tar.gz*) \
- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.lzma*) \
- unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
+ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
+ *.tar.xz*) \
+ xz -dc $(distdir).tar.xz | $(am__untar) ;;\
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
- GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
*.zip*) \
unzip $(distdir).zip ;;\
esac
@@ -1077,9 +1136,11 @@ distcheck: dist
mkdir $(distdir)/_build
mkdir $(distdir)/_inst
chmod a-w $(distdir)
+ test -d $(distdir)/_build || exit 0; \
dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
- && cd $(distdir)/_build \
+ && am__cwd=`pwd` \
+ && $(am__cd) $(distdir)/_build \
&& ../configure --srcdir=.. --prefix="$$dc_install_base" \
$(DISTCHECK_CONFIGURE_FLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) \
@@ -1101,13 +1162,15 @@ distcheck: dist
&& rm -rf "$$dc_destdir" \
&& $(MAKE) $(AM_MAKEFLAGS) dist \
&& rm -rf $(DIST_ARCHIVES) \
- && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
+ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
+ && cd "$$am__cwd" \
+ || exit 1
$(am__remove_distdir)
@(echo "$(distdir) archives ready for distribution: "; \
list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
distuninstallcheck:
- @cd $(distuninstallcheck_dir) \
+ @$(am__cd) '$(distuninstallcheck_dir)' \
&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
|| { echo "ERROR: files left after uninstall:" ; \
if test -n "$(DESTDIR)"; then \
@@ -1151,6 +1214,7 @@ clean-generic:
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -1233,19 +1297,20 @@ uninstall-man: uninstall-man1
.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
clean-binPROGRAMS clean-generic ctags dist dist-all dist-bzip2 \
- dist-gzip dist-hook dist-lzma dist-shar dist-tarZ dist-zip \
- distcheck distclean distclean-compile distclean-generic \
- distclean-tags distcleancheck distdir distuninstallcheck dvi \
- dvi-am html html-am info info-am install install-am \
- install-binPROGRAMS install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-man1 install-pdf install-pdf-am install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \
- ps ps-am tags uninstall uninstall-am uninstall-binPROGRAMS \
- uninstall-man uninstall-man1
+ dist-gzip dist-hook dist-lzma dist-shar dist-tarZ dist-xz \
+ dist-zip distcheck distclean distclean-compile \
+ distclean-generic distclean-tags distcleancheck distdir \
+ distuninstallcheck dvi dvi-am html html-am info info-am \
+ install install-am install-binPROGRAMS install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-man1 install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
+ uninstall-am uninstall-binPROGRAMS uninstall-man \
+ uninstall-man1
dist-hook:
grep "^#found_debug=" configure
@@ -1265,6 +1330,7 @@ update-index.html:
done \
)
sed "s/%%VERSION%%/${VERSION}/g" www/index.html.in >www/index.html
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
12 NOTES
View
@@ -13,6 +13,16 @@ Since the 1.2 release that tmux depends on libevent. Download it from:
http://www.monkey.org/~provos/libevent/
+To build tmux from a release tarball, do:
+
+ $ ./configure && make
+ $ sudo make install
+
+To build from a version control checkout, the configure script must be
+generated by running:
+
+ $ sh autogen.sh
+
tmux consists of a server part and multiple clients. The server is created when
required and runs continuously unless killed by the user. Clients access the
server through a socket in /tmp. Multiple sessions may be created on a single
@@ -62,4 +72,4 @@ start. Please contact me with any queries.
-- Nicholas Marriott <nicm@users.sf.net>
-$Id: NOTES 2553 2011-07-09 09:42:33Z tcunha $
+$Id: NOTES 2590 2011-09-15 12:58:39Z nicm $
13 TODO
View
@@ -132,9 +132,20 @@
- run-shell/if-shell should support status_replace stuff
- wait-pane command or another way to make it synchronous/wait for command to
finish
-- way to get command window was started with (part of format stuff?)
- last-pane across sessions
- attach should take a pane and select it as well as attaching
+- support for E3, screen-devel
+ <1311003510-28900-1-git-send-email-mlichvar@redhat.com>
+- should default-path be a window option?
+- option to put status line at top (why?)
+- panes should have names like windows
+- command-prompt doesn't work if made read-only. why?
+- option to quote format eg #{session_name:quoted}
+- formats need to be used for much much more stuff!
+- formats need conditions for >0 (for #P)
+- flags to find-window to select what is searched (title, name, content, history)
+- fetch full command line on !Linux, and add option to strip prefixes
+ such as "sh " "/bin/sh " etc etc
* We need a tmux terminfo entry to document the extensions we are using in
upstream terminfo. Must NOT change (only add or remove) anything from
TERM=screen so we can fallback!
146 aclocal.m4
View
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.10.3 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
@@ -13,8 +13,8 @@
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],,
-[m4_warning([this file was generated for autoconf 2.64.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
+[m4_warning([this file was generated for autoconf 2.68.
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])])
@@ -31,10 +31,10 @@ To do so, use the procedure documented by the package, typically `autoreconf'.])
# generated from the m4 files accompanying Automake X.Y.
# (This private macro should not be called outside this file.)
AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.10'
+[am__api_version='1.11'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.10.3], [],
+m4_if([$1], [1.11.1], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -50,7 +50,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.10.3])dnl
+[AM_AUTOMAKE_VERSION([1.11.1])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
@@ -110,14 +110,14 @@ am_aux_dir=`cd $ac_aux_dir && pwd`
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
# Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 8
+# serial 9
# AM_CONDITIONAL(NAME, SHELL-CONDITION)
# -------------------------------------
@@ -130,6 +130,7 @@ AC_SUBST([$1_TRUE])dnl
AC_SUBST([$1_FALSE])dnl
_AM_SUBST_NOTMAKE([$1_TRUE])dnl
_AM_SUBST_NOTMAKE([$1_FALSE])dnl
+m4_define([_AM_COND_VALUE_$1], [$2])dnl
if $2; then
$1_TRUE=
$1_FALSE='#'
@@ -414,7 +415,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 13
+# serial 16
# This macro actually does too much. Some checks are only needed if
# your package does certain things. But this isn't really a big deal.
@@ -431,7 +432,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
# arguments mandatory, and then we can depend on a new Autoconf
# release and drop the old call support.
AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.60])dnl
+[AC_PREREQ([2.62])dnl
dnl Autoconf wants to disallow AM_ names. We explicitly allow
dnl the ones we care about.
m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
@@ -491,24 +492,37 @@ AC_REQUIRE([AC_PROG_AWK])dnl
AC_REQUIRE([AC_PROG_MAKE_SET])dnl
AC_REQUIRE([AM_SET_LEADING_DOT])dnl
_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
- [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
- [_AM_PROG_TAR([v7])])])
+ [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
+ [_AM_PROG_TAR([v7])])])
_AM_IF_OPTION([no-dependencies],,
[AC_PROVIDE_IFELSE([AC_PROG_CC],
- [_AM_DEPENDENCIES(CC)],
- [define([AC_PROG_CC],
- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
+ [_AM_DEPENDENCIES(CC)],
+ [define([AC_PROG_CC],
+ defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
AC_PROVIDE_IFELSE([AC_PROG_CXX],
- [_AM_DEPENDENCIES(CXX)],
- [define([AC_PROG_CXX],
- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+ [_AM_DEPENDENCIES(CXX)],
+ [define([AC_PROG_CXX],
+ defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
AC_PROVIDE_IFELSE([AC_PROG_OBJC],
- [_AM_DEPENDENCIES(OBJC)],
- [define([AC_PROG_OBJC],
- defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
+ [_AM_DEPENDENCIES(OBJC)],
+ [define([AC_PROG_OBJC],
+ defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
])
+_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
+dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
+dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro
+dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
+AC_CONFIG_COMMANDS_PRE(dnl
+[m4_provide_if([_AM_COMPILER_EXEEXT],
+ [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
])
+dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
+dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
+dnl mangled by Autoconf and run in a shell conditional statement.
+m4_define([_AC_COMPILER_EXEEXT],
+m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
+
# When config.status generates a header, we must update the stamp-h file.
# This file resides in the same directory as the config header
@@ -531,7 +545,7 @@ for _am_header in $config_headers :; do
done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -542,7 +556,14 @@ echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_co
# Define $install_sh.
AC_DEFUN([AM_PROG_INSTALL_SH],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
+if test x"${install_sh}" != xset; then
+ case $am_aux_dir in
+ *\ * | *\ *)
+ install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
+ *)
+ install_sh="\${SHELL} $am_aux_dir/install-sh"
+ esac
+fi
AC_SUBST(install_sh)])
# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
@@ -568,13 +589,13 @@ AC_SUBST([am__leading_dot])])
# Check to see how 'make' treats includes. -*- Autoconf -*-
-# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 3
+# serial 4
# AM_MAKE_INCLUDE()
# -----------------
@@ -583,7 +604,7 @@ AC_DEFUN([AM_MAKE_INCLUDE],
[am_make=${MAKE-make}
cat > confinc << 'END'
am__doit:
- @echo done
+ @echo this is the am__doit target
.PHONY: am__doit
END
# If we don't find an include directive, just comment out the code.
@@ -593,24 +614,24 @@ am__quote=
_am_result=none
# First try GNU make style include.
echo "include confinc" > confmf
-# We grep out `Entering directory' and `Leaving directory'
-# messages which can occur if `w' ends up in MAKEFLAGS.
-# In particular we don't look at `^make:' because GNU make might
-# be invoked under some other name (usually "gmake"), in which
-# case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
- am__include=include
- am__quote=
- _am_result=GNU
-fi
+# Ignore all kinds of additional output from `make'.
+case `$am_make -s -f confmf 2> /dev/null` in #(
+*the\ am__doit\ target*)
+ am__include=include
+ am__quote=
+ _am_result=GNU
+ ;;
+esac
# Now try BSD make style include.
if test "$am__include" = "#"; then
echo '.include "confinc"' > confmf
- if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
- am__include=.include
- am__quote="\""
- _am_result=BSD
- fi
+ case `$am_make -s -f confmf 2> /dev/null` in #(
+ *the\ am__doit\ target*)
+ am__include=.include
+ am__quote="\""
+ _am_result=BSD
+ ;;
+ esac
fi
AC_SUBST([am__include])
AC_SUBST([am__quote])
@@ -655,14 +676,14 @@ m4_define([AC_PROG_CC],
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
# Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 5
+# serial 6
# AM_MISSING_PROG(NAME, PROGRAM)
# ------------------------------
@@ -679,7 +700,14 @@ AC_SUBST($1)])
AC_DEFUN([AM_MISSING_HAS_RUN],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
AC_REQUIRE_AUX_FILE([missing])dnl
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
+if test x"${MISSING+set}" != xset; then
+ case $am_aux_dir in
+ *\ * | *\ *)
+ MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+ *)
+ MISSING="\${SHELL} $am_aux_dir/missing" ;;
+ esac
+fi
# Use eval to expand $SHELL
if eval "$MISSING --run true"; then
am_missing_run="$MISSING --run "
@@ -750,14 +778,14 @@ AC_DEFUN([_AM_IF_OPTION],
# Check to make sure that the build environment is sane. -*- Autoconf -*-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
# Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 4
+# serial 5
# AM_SANITY_CHECK
# ---------------
@@ -766,16 +794,29 @@ AC_DEFUN([AM_SANITY_CHECK],
# Just in case
sleep 1
echo timestamp > conftest.file
+# Reject unsafe characters in $srcdir or the absolute working directory
+# name. Accept space and tab only in the latter.
+am_lf='
+'
+case `pwd` in
+ *[[\\\"\#\$\&\'\`$am_lf]]*)
+ AC_MSG_ERROR([unsafe absolute working directory name]);;
+esac
+case $srcdir in
+ *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*)
+ AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
+esac
+
# Do `set' in a subshell so we don't clobber the current shell's
# arguments. Must try -L first in case configure is actually a
# symlink; some systems play weird games with the mod time of symlinks
# (eg FreeBSD returns the mod time of the symlink's containing
# directory).
if (
- set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
if test "$[*]" = "X"; then
# -L didn't work.
- set X `ls -t $srcdir/configure conftest.file`
+ set X `ls -t "$srcdir/configure" conftest.file`
fi
rm -f conftest.file
if test "$[*]" != "X $srcdir/configure conftest.file" \
@@ -828,18 +869,25 @@ fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006 Free Software Foundation, Inc.
+# Copyright (C) 2006, 2008 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
+# serial 2
+
# _AM_SUBST_NOTMAKE(VARIABLE)
# ---------------------------
# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
# This macro is traced by Automake.
AC_DEFUN([_AM_SUBST_NOTMAKE])
+# AM_SUBST_NOTMAKE(VARIABLE)
+# ---------------------------
+# Public sister of _AM_SUBST_NOTMAKE.
+AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
+
# Check how to create a tarball. -*- Autoconf -*-
# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
37 cfg.c
View
@@ -1,4 +1,4 @@
-/* $Id: cfg.c 2553 2011-07-09 09:42:33Z tcunha $ */
+/* $Id: cfg.c 2588 2011-08-25 21:14:23Z tcunha $ */
/*
* Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -92,22 +92,37 @@ load_cfg(const char *path, struct cmd_ctx *ctxin, struct causelist *causes)
retval = 0;
while ((buf = fgetln(f, &len))) {
if (buf[len - 1] == '\n')
- buf[len - 1] = '\0';
+ len--;
+
+ if (line != NULL)
+ line = xrealloc(line, 1, strlen(line) + len + 1);
else {
- line = xrealloc(line, 1, len + 1);
- memcpy(line, buf, len);
- line[len] = '\0';
- buf = line;
+ line = xmalloc(len + 1);
+ *line = '\0';
}
+
+ /* Append buffer to line. strncat will terminate. */
+ strncat(line, buf, len);
n++;
+ /* Continuation: get next line? */
+ len = strlen(line);
+ if (len > 0 && line[len - 1] == '\\') {
+ line[len - 1] = '\0';
+ continue;
+ }
+ buf = line;
+ line = NULL;
+
if (cmd_string_parse(buf, &cmdlist, &cause) != 0) {
+ xfree(buf);
if (cause == NULL)
continue;
cfg_add_cause(causes, "%s: %u: %s", path, n, cause);
xfree(cause);
continue;
- }
+ } else
+ xfree(buf);
if (cmdlist == NULL)
continue;
cfg_cause = NULL;
@@ -131,12 +146,16 @@ load_cfg(const char *path, struct cmd_ctx *ctxin, struct causelist *causes)
retval = 1;
cmd_list_free(cmdlist);
if (cfg_cause != NULL) {
- cfg_add_cause(causes, "%s: %d: %s", path, n, cfg_cause);
+ cfg_add_cause(
+ causes, "%s: %d: %s", path, n, cfg_cause);
xfree(cfg_cause);
}
}
- if (line != NULL)
+ if (line != NULL) {
+ cfg_add_cause(causes,
+ "%s: %d: line continuation at end of file", path, n);
xfree(line);
+ }
fclose(f);
return (retval);
3  cmd-capture-pane.c
View
@@ -1,4 +1,4 @@
-/* $Id: cmd-capture-pane.c 2553 2011-07-09 09:42:33Z tcunha $ */
+/* $Id: cmd-capture-pane.c 2595 2011-09-21 16:34:34Z tcunha $ */
/*
* Copyright (c) 2009 Jonathan Alvarado <radobobo@users.sourceforge.net>
@@ -109,6 +109,7 @@ cmd_capture_pane_exec(struct cmd *self, struct cmd_ctx *ctx)
buffer = args_strtonum(args, 'b', 0, INT_MAX, &cause);
if (cause != NULL) {
ctx->error(ctx, "buffer %s", cause);
+ xfree(buf);
xfree(cause);
return (-1);
}
8 cmd-choose-client.c
View
@@ -1,4 +1,4 @@
-/* $Id: cmd-choose-client.c 2553 2011-07-09 09:42:33Z tcunha $ */
+/* $Id: cmd-choose-client.c 2582 2011-08-21 12:38:55Z tcunha $ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -76,9 +76,11 @@ cmd_choose_client_exec(struct cmd *self, struct cmd_ctx *ctx)
idx++;
window_choose_add(wl->window->active, i,
- "%s: %s [%ux%u %s]%s", c->tty.path,
+ "%s: %s [%ux%u %s]%s%s", c->tty.path,
c->session->name, c->tty.sx, c->tty.sy,
- c->tty.termname, c->tty.flags & TTY_UTF8 ? " (utf8)" : "");
+ c->tty.termname,
+ c->tty.flags & TTY_UTF8 ? " (utf8)" : "",
+ c->flags & CLIENT_READONLY ? " (ro)" : "");
}
cdata = xmalloc(sizeof *cdata);
9 cmd-list-clients.c
View
@@ -1,4 +1,4 @@
-/* $Id: cmd-list-clients.c 2553 2011-07-09 09:42:33Z tcunha $ */
+/* $Id: cmd-list-clients.c 2582 2011-08-21 12:38:55Z tcunha $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -33,7 +33,7 @@ const struct cmd_entry cmd_list_clients_entry = {
"list-clients", "lsc",
"t:", 0, 0,
CMD_TARGET_SESSION_USAGE,
- 0,
+ CMD_READONLY,
NULL,
NULL,
cmd_list_clients_exec
@@ -68,9 +68,10 @@ cmd_list_clients_exec(struct cmd *self, struct cmd_ctx *ctx)
if (s != NULL && s != c->session)
continue;
- ctx->print(ctx, "%s: %s [%ux%u %s]%s", c->tty.path,
+ ctx->print(ctx, "%s: %s [%ux%u %s]%s%s", c->tty.path,
c->session->name, c->tty.sx, c->tty.sy,
- c->tty.termname, s_utf8);
+ c->tty.termname, s_utf8,
+ c->flags & CLIENT_READONLY ? " (ro)" : "");
}
return (0);
100 cmd-list-panes.c
View
@@ -1,4 +1,4 @@
-/* $Id: cmd-list-panes.c 2553 2011-07-09 09:42:33Z tcunha $ */
+/* $Id: cmd-list-panes.c 2591 2011-09-21 16:31:15Z tcunha $ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -28,15 +28,16 @@
int cmd_list_panes_exec(struct cmd *, struct cmd_ctx *);
-void cmd_list_panes_server(struct cmd_ctx *);
-void cmd_list_panes_session(struct session *, struct cmd_ctx *, int);
-void cmd_list_panes_window(
+void cmd_list_panes_server(struct cmd *, struct cmd_ctx *);
+void cmd_list_panes_session(
+ struct cmd *, struct session *, struct cmd_ctx *, int);
+void cmd_list_panes_window(struct cmd *,
struct session *, struct winlink *, struct cmd_ctx *, int);
const struct cmd_entry cmd_list_panes_entry = {
"list-panes", "lsp",
- "ast:", 0, 0,
- "[-as] [-t target]",
+ "asF:t:", 0, 0,
+ "[-as] [-F format] [-t target]",
0,
NULL,
NULL,
@@ -51,87 +52,92 @@ cmd_list_panes_exec(struct cmd *self, struct cmd_ctx *ctx)
struct winlink *wl;
if (args_has(args, 'a'))
- cmd_list_panes_server(ctx);
+ cmd_list_panes_server(self, ctx);
else if (args_has(args, 's')) {
s = cmd_find_session(ctx, args_get(args, 't'), 0);
if (s == NULL)
return (-1);
- cmd_list_panes_session(s, ctx, 1);
+ cmd_list_panes_session(self, s, ctx, 1);
} else {
wl = cmd_find_window(ctx, args_get(args, 't'), &s);
if (wl == NULL)
return (-1);
- cmd_list_panes_window(s, wl, ctx, 0);
+ cmd_list_panes_window(self, s, wl, ctx, 0);
}
return (0);
}
void
-cmd_list_panes_server(struct cmd_ctx *ctx)
+cmd_list_panes_server(struct cmd *self, struct cmd_ctx *ctx)
{
struct session *s;
RB_FOREACH(s, sessions, &sessions)
- cmd_list_panes_session(s, ctx, 2);
+ cmd_list_panes_session(self, s, ctx, 2);
}
void
-cmd_list_panes_session(struct session *s, struct cmd_ctx *ctx, int type)
+cmd_list_panes_session(
+ struct cmd *self, struct session *s, struct cmd_ctx *ctx, int type)
{
struct winlink *wl;
RB_FOREACH(wl, winlinks, &s->windows)
- cmd_list_panes_window(s, wl, ctx, type);
+ cmd_list_panes_window(self, s, wl, ctx, type);
}
void
-cmd_list_panes_window(
+cmd_list_panes_window(struct cmd *self,
struct session *s, struct winlink *wl, struct cmd_ctx *ctx, int type)
{
+ struct args *args = self->args;
struct window_pane *wp;
- struct grid *gd;
- struct grid_line *gl;
- u_int i, n;
- unsigned long long size;
-
- n = 0;
- TAILQ_FOREACH(wp, &wl->window->panes, entry) {
- gd = wp->base.grid;
-
- size = 0;
- for (i = 0; i < gd->hsize; i++) {
- gl = &gd->linedata[i];
- size += gl->cellsize * sizeof *gl->celldata;
- size += gl->utf8size * sizeof *gl->utf8data;
- }
- size += gd->hsize * sizeof *gd->linedata;
+ u_int n;
+ struct format_tree *ft;
+ const char *template;
+ char *line;
+ template = args_get(args, 'F');
+ if (template == NULL) {
switch (type) {
case 0:
- ctx->print(ctx,
- "%u: [%ux%u] [history %u/%u, %llu bytes] %%%u%s%s",
- n, wp->sx, wp->sy, gd->hsize, gd->hlimit, size,
- wp->id, wp == wp->window->active ? " (active)" : "",
- wp->fd == -1 ? " (dead)" : "");
+ template = "#{line}: "
+ "[#{pane_width}x#{pane_height}] [history "
+ "#{history_size}/#{history_limit}, "
+ "#{history_bytes} bytes] #{pane_id}"
+ "#{?pane_active, (active),}#{?pane_dead, (dead),}";
break;
case 1:
- ctx->print(ctx,
- "%d.%u: [%ux%u] [history %u/%u, %llu bytes] "
- "%%%u%s%s", wl->idx,
- n, wp->sx, wp->sy, gd->hsize, gd->hlimit, size,
- wp->id, wp == wp->window->active ? " (active)" : "",
- wp->fd == -1 ? " (dead)" : "");
+ template = "#{window_index}.#{line}: "
+ "[#{pane_width}x#{pane_height}] [history "
+ "#{history_size}/#{history_limit}, "
+ "#{history_bytes} bytes] #{pane_id}"
+ "#{?pane_active, (active),}#{?pane_dead, (dead),}";
break;
case 2:
- ctx->print(ctx,
- "%s:%d.%u: [%ux%u] [history %u/%u, %llu bytes] "
- "%%%u%s%s", s->name, wl->idx,
- n, wp->sx, wp->sy, gd->hsize, gd->hlimit, size,
- wp->id, wp == wp->window->active ? " (active)" : "",
- wp->fd == -1 ? " (dead)" : "");
+ template = "#{session_name}:#{window_index}.#{line}: "
+ "[#{pane_width}x#{pane_height}] [history "
+ "#{history_size}/#{history_limit}, "
+ "#{history_bytes} bytes] #{pane_id}"
+ "#{?pane_active, (active),}#{?pane_dead, (dead),}";
break;
}
+ }
+
+ n = 0;
+ TAILQ_FOREACH(wp, &wl->window->panes, entry) {
+ ft = format_create();
+ format_add(ft, "line", "%u", n);
+ format_session(ft, s);
+ format_winlink(ft, s, wl);
+ format_window_pane(ft, wp);
+
+ line = format_expand(ft, template);
+ ctx->print(ctx, "%s", line);
+ xfree(line);
+
+ format_free(ft);
n++;
}
}
49 cmd-list-sessions.c
View
@@ -1,4 +1,4 @@
-/* $Id: cmd-list-sessions.c 2553 2011-07-09 09:42:33Z tcunha $ */
+/* $Id: cmd-list-sessions.c 2591 2011-09-21 16:31:15Z tcunha $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -31,40 +31,45 @@ int cmd_list_sessions_exec(struct cmd *, struct cmd_ctx *);
const struct cmd_entry cmd_list_sessions_entry = {
"list-sessions", "ls",
- "", 0, 0,
- "",
+ "F:", 0, 0,
+ "[-F format]",
0,
NULL,
NULL,
cmd_list_sessions_exec
};
-/* ARGSUSED */
int
-cmd_list_sessions_exec(unused struct cmd *self, struct cmd_ctx *ctx)
+cmd_list_sessions_exec(struct cmd *self, struct cmd_ctx *ctx)
{
+ struct args *args = self->args;
struct session *s;
- struct session_group *sg;
- char *tim, tmp[64];
- u_int idx;
- time_t t;
+ u_int n;
+ struct format_tree *ft;
+ const char *template;
+ char *line;
+ template = args_get(args, 'F');
+ if (template == NULL) {
+ template = "#{session_name}: #{session_windows} windows "
+ "(created #{session_created_string}) [#{session_width}x"
+ "#{session_height}]#{?session_grouped, (group ,}"
+ "#{session_group}#{?session_grouped,),}"
+ "#{?session_attached, (attached),}";
+ }
+
+ n = 0;
RB_FOREACH(s, sessions, &sessions) {
- sg = session_group_find(s);
- if (sg == NULL)
- *tmp = '\0';
- else {
- idx = session_group_index(sg);
- xsnprintf(tmp, sizeof tmp, " (group %u)", idx);
- }
+ ft = format_create();
+ format_add(ft, "line", "%u", n);
+ format_session(ft, s);
- t = s->creation_time.tv_sec;
- tim = ctime(&t);
- *strchr(tim, '\n') = '\0';
+ line = format_expand(ft, template);
+ ctx->print(ctx, "%s", line);
+ xfree(line);
- ctx->print(ctx, "%s: %u windows (created %s) [%ux%u]%s%s",
- s->name, winlink_count(&s->windows), tim, s->sx, s->sy,
- tmp, s->flags & SESSION_UNATTACHED ? "" : " (attached)");
+ format_free(ft);
+ n++;
}
return (0);
75 cmd-list-windows.c
View
@@ -1,4 +1,4 @@
-/* $Id: cmd-list-windows.c 2553 2011-07-09 09:42:33Z tcunha $ */
+/* $Id: cmd-list-windows.c 2604 2011-10-02 11:30:26Z tcunha $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -28,13 +28,14 @@
int cmd_list_windows_exec(struct cmd *, struct cmd_ctx *);
-void cmd_list_windows_server(struct cmd_ctx *);
-void cmd_list_windows_session(struct session *, struct cmd_ctx *, int);
+void cmd_list_windows_server(struct cmd *, struct cmd_ctx *);
+void cmd_list_windows_session(
+ struct cmd *, struct session *, struct cmd_ctx *, int);
const struct cmd_entry cmd_list_windows_entry = {
"list-windows", "lsw",
- "at:", 0, 0,
- "[-a] " CMD_TARGET_SESSION_USAGE,
+ "aF:t:", 0, 0,
+ "[-a] [-F format] " CMD_TARGET_SESSION_USAGE,
0,
NULL,
NULL,
@@ -48,45 +49,69 @@ cmd_list_windows_exec(struct cmd *self, struct cmd_ctx *ctx)
struct session *s;
if (args_has(args, 'a'))
- cmd_list_windows_server(ctx);
+ cmd_list_windows_server(self, ctx);
else {
s = cmd_find_session(ctx, args_get(args, 't'), 0);
if (s == NULL)
return (-1);
- cmd_list_windows_session(s, ctx, 0);
+ cmd_list_windows_session(self, s, ctx, 0);
}
return (0);
}
void
-cmd_list_windows_server(struct cmd_ctx *ctx)
+cmd_list_windows_server(struct cmd *self, struct cmd_ctx *ctx)
{
struct session *s;
RB_FOREACH(s, sessions, &sessions)
- cmd_list_windows_session(s, ctx, 1);
+ cmd_list_windows_session(self, s, ctx, 1);
}
void
-cmd_list_windows_session(struct session *s, struct cmd_ctx *ctx, int type)
+cmd_list_windows_session(
+ struct cmd *self, struct session *s, struct cmd_ctx *ctx, int type)
{
- struct winlink *wl;
- char *layout;
+ struct args *args = self->args;
+ struct winlink *wl;
+ u_int n;
+ struct format_tree *ft;
+ const char *template;
+ char *line;
- RB_FOREACH(wl, winlinks, &s->windows) {
- layout = layout_dump(wl->window);
- if (type) {
- ctx->print(ctx, "%s:%d: %s [%ux%u] [layout %s]%s",
- s->name, wl->idx, wl->window->name, wl->window->sx,
- wl->window->sy, layout,
- wl == s->curw ? " (active)" : "");
- } else {
- ctx->print(ctx, "%d: %s [%ux%u] [layout %s]%s",
- wl->idx, wl->window->name, wl->window->sx,
- wl->window->sy, layout,
- wl == s->curw ? " (active)" : "");
+ template = args_get(args, 'F');
+ if (template == NULL) {
+ switch (type) {
+ case 0:
+ template = "#{window_index}: "
+ "#{window_name} "
+ "[#{window_width}x#{window_height}] "
+ "[layout #{window_layout}]"
+ "#{?window_active, (active),}";
+ break;
+ case 1:
+ template = "#{session_name}:#{window_index}: "
+ "#{window_name} "
+ "[#{window_width}x#{window_height}] "
+ "[layout #{window_layout}]"
+ "#{?window_active, (active),}";
+ break;
}
- xfree(layout);
+ }
+
+ n = 0;
+ RB_FOREACH(wl, winlinks, &s->windows) {
+ ft = format_create();
+ format_add(ft, "line", "%u", n);
+ format_session(ft, s);
+ format_winlink(ft, s, wl);
+
+ line = format_expand(ft, template);
+ ctx->print(ctx, "%s", line);
+ xfree(line);
+
+ format_free(ft);
+ n++;
}
}
6 cmd-pipe-pane.c
View
@@ -1,4 +1,4 @@
-/* $Id: cmd-pipe-pane.c 2553 2011-07-09 09:42:33Z tcunha $ */
+/* $Id: cmd-pipe-pane.c 2573 2011-08-04 17:04:08Z tcunha $ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -54,11 +54,9 @@ cmd_pipe_pane_exec(struct cmd *self, struct cmd_ctx *ctx)
char *command;
int old_fd, pipe_fd[2], null_fd;
- if ((c = cmd_find_client(ctx, NULL)) == NULL)
- return (-1);
-
if (cmd_find_pane(ctx, args_get(args, 't'), NULL, &wp) == NULL)
return (-1);
+ c = cmd_find_client(ctx, NULL);
/* Destroy the old pipe. */
old_fd = wp->pipe_fd;
12 cmd-refresh-client.c
View
@@ -1,4 +1,4 @@
-/* $Id: cmd-refresh-client.c 2553 2011-07-09 09:42:33Z tcunha $ */
+/* $Id: cmd-refresh-client.c 2607 2011-10-02 11:33:14Z tcunha $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -28,8 +28,8 @@ int cmd_refresh_client_exec(struct cmd *, struct cmd_ctx *);
const struct cmd_entry cmd_refresh_client_entry = {
"refresh-client", "refresh",
- "t:", 0, 0,
- CMD_TARGET_CLIENT_USAGE,
+ "St:", 0, 0,
+ "[-S] " CMD_TARGET_CLIENT_USAGE,
0,
NULL,
NULL,
@@ -45,7 +45,11 @@ cmd_refresh_client_exec(struct cmd *self, struct cmd_ctx *ctx)
if ((c = cmd_find_client(ctx, args_get(args, 't'))) == NULL)
return (-1);
- server_redraw_client(c);
+ if (args_has(args, 'S')) {
+ status_update_jobs(c);
+ server_status_client(c);
+ } else
+ server_redraw_client(c);
return (0);
}
14 cmd-split-window.c
View
@@ -1,4 +1,4 @@
-/* $Id: cmd-split-window.c 2553 2011-07-09 09:42:33Z tcunha $ */
+/* $Id: cmd-split-window.c 2594 2011-09-21 16:34:04Z tcunha $ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -57,7 +57,7 @@ cmd_split_window_exec(struct cmd *self, struct cmd_ctx *ctx)
struct window *w;
struct window_pane *wp, *new_wp = NULL;
struct environ env;
- char *cmd, *cwd, *cause;
+ char *cmd, *cwd, *cause, *new_cause;
const char *shell;
u_int hlimit, paneidx;
int size, percentage;
@@ -93,16 +93,18 @@ cmd_split_window_exec(struct cmd *self, struct cmd_ctx *ctx)
if (args_has(args, 'l')) {
size = args_strtonum(args, 'l', 0, INT_MAX, &cause);
if (cause != NULL) {
- ctx->error(ctx, "size %s", cause);
+ xasprintf(&new_cause, "size %s", cause);
xfree(cause);
- return (-1);
+ cause = new_cause;
+ goto error;
}
} else if (args_has(args, 'p')) {
percentage = args_strtonum(args, 'p', 0, INT_MAX, &cause);
if (cause != NULL) {
- ctx->error(ctx, "percentage %s", cause);
+ xasprintf(&new_cause, "percentage %s", cause);
xfree(cause);
- return (-1);
+ cause = new_cause;
+ goto error;
}
if (type == LAYOUT_TOPBOTTOM)
size = (wp->sy * percentage) / 100;
18 cmd-switch-client.c
View
@@ -1,4 +1,4 @@
-/* $Id: cmd-switch-client.c 2553 2011-07-09 09:42:33Z tcunha $ */
+/* $Id: cmd-switch-client.c 2582 2011-08-21 12:38:55Z tcunha $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -32,9 +32,9 @@ int cmd_switch_client_exec(struct cmd *, struct cmd_ctx *);
const struct cmd_entry cmd_switch_client_entry = {
"switch-client", "switchc",
- "lc:npt:", 0, 0,
- "[-lnp] [-c target-client] [-t target-session]",
- 0,
+ "lc:npt:r", 0, 0,
+ "[-lnpr] [-c target-client] [-t target-session]",
+ CMD_READONLY,
cmd_switch_client_key_binding,
NULL,
cmd_switch_client_exec
@@ -67,6 +67,16 @@ cmd_switch_client_exec(struct cmd *self, struct cmd_ctx *ctx)
if ((c = cmd_find_client(ctx, args_get(args, 'c'))) == NULL)
return (-1);
+ if (args_has(args, 'r')) {
+ if (c->flags & CLIENT_READONLY) {
+ c->flags &= ~CLIENT_READONLY;
+ ctx->info(ctx, "made client writable");
+ } else {
+ c->flags |= CLIENT_READONLY;
+ ctx->info(ctx, "made client read-only");
+ }
+ }
+
s = NULL;
if (args_has(args, 'n')) {
if ((s = session_next_session(c->session)) == NULL) {
6 cmd-unbind-key.c
View
@@ -1,4 +1,4 @@
-/* $Id: cmd-unbind-key.c 2553 2011-07-09 09:42:33Z tcunha $ */
+/* $Id: cmd-unbind-key.c 2580 2011-08-21 12:36:43Z tcunha $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -59,9 +59,7 @@ cmd_unbind_key_exec(struct cmd *self, unused struct cmd_ctx *ctx)
if (args_has(args, 'a')) {
while (!SPLAY_EMPTY(&key_bindings)) {
bd = SPLAY_ROOT(&key_bindings);
- SPLAY_REMOVE(key_bindings, &key_bindings, bd);
- cmd_list_free(bd->cmdlist);
- xfree(bd);
+ key_bindings_remove(bd->key);
}
return (0);
}
14 colour.c
View
@@ -1,4 +1,4 @@
-/* $Id: colour.c 2553 2011-07-09 09:42:33Z tcunha $ */
+/* $Id: colour.c 2584 2011-08-25 21:11:16Z tcunha $ */
/*
* Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -19,7 +19,6 @@
#include <sys/types.h>
#include <ctype.h>
-#include <math.h>
#include <stdlib.h>
#include <string.h>
@@ -41,7 +40,7 @@ struct colour_rgb {
struct colour_rgb *colour_rgb_256;
void colour_rgb_generate256(void);
-double colour_rgb_distance(struct colour_rgb *, struct colour_rgb *);
+u_int colour_rgb_distance(struct colour_rgb *, struct colour_rgb *);
int colour_rgb_find(struct colour_rgb *);
/* Generate 256 colour RGB table. */
@@ -91,7 +90,7 @@ colour_rgb_generate256(void)
}
/* Get colour RGB distance. */
-double
+u_int
colour_rgb_distance(struct colour_rgb *rgb1, struct colour_rgb *rgb2)
{
int r, g, b;
@@ -99,21 +98,20 @@ colour_rgb_distance(struct colour_rgb *rgb1, struct colour_rgb *rgb2)
r = rgb1->r - rgb2->r;
g = rgb1->g - rgb2->g;
b = rgb1->b - rgb2->b;
- return (sqrt(r * r + g * g + b * b));
+ return (r * r + g * g + b * b);
}
/* Work out the nearest colour from the 256 colour set. */
int
colour_rgb_find(struct colour_rgb *rgb)
{
- double distance, lowest;
- u_int colour, i;
+ u_int distance, lowest, colour, i;
if (colour_rgb_256 == NULL)
colour_rgb_generate256();
colour = 16;
- lowest = INFINITY;
+ lowest = UINT_MAX;
for (i = 0; i < 240; i++) {
distance = colour_rgb_distance(&colour_rgb_256[i], rgb);
if (distance < lowest) {
7 compat.h
View
@@ -1,4 +1,4 @@
-/* $Id: compat.h 2553 2011-07-09 09:42:33Z tcunha $ */
+/* $Id: compat.h 2566 2011-07-22 15:10:24Z nicm $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -196,6 +196,11 @@ size_t strlcat(char *, const char *, size_t);
int daemon(int, int);
#endif
+#ifndef HAVE_B64_NTOP
+/* b64_ntop.c */
+int b64_ntop(const char *, size_t, char *, size_t);
+#endif
+
#ifndef HAVE_FORKPTY
/* forkpty.c */
#include <sys/ioctl.h>
7 compat/asprintf.c
View
@@ -1,4 +1,4 @@
-/* $Id: asprintf.c 2553 2011-07-09 09:42:33Z tcunha $ */
+/* $Id: asprintf.c 2567 2011-07-25 09:56:43Z nicm $ */
/*
* Copyright (c) 2006 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -44,12 +44,15 @@ int
vasprintf(char **ret, const char *fmt, va_list ap)
{
int n;
+ va_list ap2;
+
+ va_copy(ap2, ap);
if ((n = vsnprintf(NULL, 0, fmt, ap)) < 0)
goto error;
*ret = xmalloc(n + 1);
- if ((n = vsnprintf(*ret, n + 1, fmt, ap)) < 0) {
+ if ((n = vsnprintf(*ret, n + 1, fmt, ap2)) < 0) {
xfree(*ret);
goto error;
}
182 compat/b64_ntop.c
View
@@ -0,0 +1,182 @@
+/*
+ * Copyright (c) 1996, 1998 by Internet Software Consortium.
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
+ * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
+ * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
+ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+ * SOFTWARE.
+ */
+
+/*
+ * Portions Copyright (c) 1995 by International Business Machines, Inc.
+ *
+ * International Business Machines, Inc. (hereinafter called IBM) grants
+ * permission under its copyrights to use, copy, modify, and distribute this
+ * Software with or without fee, provided that the above copyright notice and
+ * all paragraphs of this notice appear in all copies, and that the name of IBM
+ * not be used in connection with the marketing of any product incorporating
+ * the Software or modifications thereof, without specific, written prior
+ * permission.
+ *
+ * To the extent it has a right to do so, IBM grants an immunity from suit
+ * under its patents, if any, for the use, sale or manufacture of products to
+ * the extent that such products are used for performing Domain Name System
+ * dynamic updates in TCP/IP networks by means of the Software. No immunity is
+ * granted for any product per se or for any other function of any product.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", AND IBM DISCLAIMS ALL WARRANTIES,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE. IN NO EVENT SHALL IBM BE LIABLE FOR ANY SPECIAL,
+ * DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE, EVEN
+ * IF IBM IS APPRISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#include <sys/types.h>
+#include <sys/param.h>
+#include <sys/socket.h>
+
+#include <netinet/in.h>
+#include <arpa/inet.h>
+
+#include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#define Assert(Cond) if (!(Cond)) abort()
+
+static const char Base64[] =
+ "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+static const char Pad64 = '=';
+
+/* (From RFC1521 and draft-ietf-dnssec-secext-03.txt)
+ The following encoding technique is taken from RFC 1521 by Borenstein
+ and Freed. It is reproduced here in a slightly edited form for
+ convenience.
+
+ A 65-character subset of US-ASCII is used, enabling 6 bits to be
+ represented per printable character. (The extra 65th character, "=",
+ is used to signify a special processing function.)
+
+ The encoding process represents 24-bit groups of input bits as output
+ strings of 4 encoded characters. Proceeding from left to right, a
+ 24-bit input group is formed by concatenating 3 8-bit input groups.
+ These 24 bits are then treated as 4 concatenated 6-bit groups, each
+ of which is translated into a single digit in the base64 alphabet.
+
+ Each 6-bit group is used as an index into an array of 64 printable
+ characters. The character referenced by the index is placed in the
+ output string.
+
+ Table 1: The Base64 Alphabet
+
+ Value Encoding Value Encoding Value Encoding Value Encoding
+ 0 A 17 R 34 i 51 z
+ 1 B 18 S 35 j 52 0
+ 2 C 19 T 36 k 53 1
+ 3 D 20 U 37 l 54 2
+ 4 E 21 V 38 m 55 3
+ 5 F 22 W 39 n 56 4
+ 6 G 23 X 40 o 57 5
+ 7 H 24 Y 41 p 58 6
+ 8 I 25 Z 42 q 59 7
+ 9 J 26 a 43 r 60 8
+ 10 K 27 b 44 s 61 9
+ 11 L 28 c 45 t 62 +
+ 12 M 29 d 46 u 63 /
+ 13 N 30 e 47 v
+ 14 O 31 f 48 w (pad) =
+ 15 P 32 g 49 x
+ 16 Q 33 h 50 y
+
+ Special processing is performed if fewer than 24 bits are available
+ at the end of the data being encoded. A full encoding quantum is
+ always completed at the end of a quantity. When fewer than 24 input
+ bits are available in an input group, zero bits are added (on the
+ right) to form an integral number of 6-bit groups. Padding at the
+ end of the data is performed using the '=' character.
+
+ Since all base64 input is an integral number of octets, only the
+ -------------------------------------------------
+ following cases can arise:
+
+ (1) the final quantum of encoding input is an integral
+ multiple of 24 bits; here, the final unit of encoded
+ output will be an integral multiple of 4 characters
+ with no "=" padding,
+ (2) the final quantum of encoding input is exactly 8 bits;
+ here, the final unit of encoded output will be two
+ characters followed by two "=" padding characters, or
+ (3) the final quantum of encoding input is exactly 16 bits;
+ here, the final unit of encoded output will be three
+ characters followed by one "=" padding character.
+ */
+
+int
+b64_ntop(uint8_t const *src, size_t srclength, char *target, size_t targsize) {
+ size_t datalength = 0;
+ uint8_t input[3];
+ uint8_t output[4];
+ size_t i;
+
+ while (2 < srclength) {
+ input[0] = *src++;
+ input[1] = *src++;
+ input[2] = *src++;
+ srclength -= 3;
+
+ output[0] = input[0] >> 2;
+ output[1] = ((input[0] & 0x03) << 4) + (input[1] >> 4);
+ output[2] = ((input[1] & 0x0f) << 2) + (input[2] >> 6);
+ output[3] = input[2] & 0x3f;
+ Assert(output[0] < 64);
+ Assert(output[1] < 64);
+ Assert(output[2] < 64);
+ Assert(output[3] < 64);
+
+ if (datalength + 4 > targsize)
+ return (-1);
+ target[datalength++] = Base64[output[0]];
+ target[datalength++] = Base64[output[1]];
+ target[datalength++] = Base64[output[2]];
+ target[datalength++] = Base64[output[3]];
+ }
+
+ /* Now we worry about padding. */
+ if (0 != srclength) {
+ /* Get what's left. */
+ input[0] = input[1] = input[2] = '\0';
+ for (i = 0; i < srclength; i++)
+ input[i] = *src++;
+
+ output[0] = input[0] >> 2;
+ output[1] = ((input[0] & 0x03) << 4) + (input[1] >> 4);
+ output[2] = ((input[1] & 0x0f) << 2) + (input[2] >> 6);
+ Assert(output[0] < 64);
+ Assert(output[1] < 64);
+ Assert(output[2] < 64);
+
+ if (datalength + 4 > targsize)
+ return (-1);
+ target[datalength++] = Base64[output[0]];
+ target[datalength++] = Base64[output[1]];
+ if (srclength == 1)
+ target[datalength++] = Pad64;
+ else
+ target[datalength++] = Base64[output[2]];
+ target[datalength++] = Pad64;
+ }
+ if (datalength >= targsize)
+ return (-1);
+ target[datalength] = '\0'; /* Returned value doesn't count \0. */
+ return (datalength);
+}
1,271 configure
View
626 additions, 645 deletions not shown
78 configure.ac
View
@@ -1,7 +1,7 @@
-# $Id: configure.ac 2558 2011-07-09 16:00:16Z tcunha $
+# $Id: configure.ac 2600 2011-09-29 08:43:01Z nicm $
# Miscellaneous autofoo bullshit.
-AC_INIT(tmux, 1.5)
+AC_INIT(tmux, 1.6)
AC_CONFIG_AUX_DIR(etc)
AM_INIT_AUTOMAKE([foreign])
@@ -12,6 +12,7 @@ AC_CANONICAL_HOST
# autoconf will automatically use CFLAGS="-O2 -g". Prevent that by using an
# empty default.
: ${CFLAGS=""}
+
# Set up the compiler in two different ways and say yes we may want to install.
AC_PROG_CC
AM_PROG_CC_C_O
@@ -52,9 +53,8 @@ AM_CONDITIONAL(IS_DEBUG, test "x$found_debug" = xyes)
AC_ARG_ENABLE(
static,
AC_HELP_STRING(--enable-static, create a static build),
- [found_static=$enable_static]
+ [LDFLAGS="$LDFLAGS -static"]
)
-AM_CONDITIONAL(IS_STATIC, test "x" = xyes)