From 7b2c8e976901a04c6fe33f1f5df37de7e29c386f Mon Sep 17 00:00:00 2001 From: wiz Date: Wed, 12 Dec 2012 13:21:42 +0000 Subject: Import fish-1.23.1 as shells/fish, packaged for wip by Moritz Wilhelmy, Adam Hoka and hugor. fish is a user friendly command line shell for UNIX-like operating systems, written mainly with interactive use in mind. It differs from other shells in that it only provides as few commands as built-ins as possible and has a daemon which allows it to have shared variables and command-line history between shell instances. It also features feature-rich tab-completion and has command-line syntax highlighting. --- shells/fish/DESCR | 7 + shells/fish/Makefile | 35 +++ shells/fish/PLIST | 418 ++++++++++++++++++++++++++++++++++ shells/fish/distinfo | 9 + shells/fish/patches/patch-Makefile.in | 21 ++ shells/fish/patches/patch-configure | 15 ++ shells/fish/patches/patch-proc.h | 15 ++ shells/fish/patches/patch-screen.c | 24 ++ 8 files changed, 544 insertions(+) create mode 100644 shells/fish/DESCR create mode 100644 shells/fish/Makefile create mode 100644 shells/fish/PLIST create mode 100644 shells/fish/distinfo create mode 100644 shells/fish/patches/patch-Makefile.in create mode 100644 shells/fish/patches/patch-configure create mode 100644 shells/fish/patches/patch-proc.h create mode 100644 shells/fish/patches/patch-screen.c (limited to 'shells') diff --git a/shells/fish/DESCR b/shells/fish/DESCR new file mode 100644 index 00000000000..741ea0a3a80 --- /dev/null +++ b/shells/fish/DESCR @@ -0,0 +1,7 @@ +fish is a user friendly command line shell for UNIX-like operating +systems, written mainly with interactive use in mind. It differs +from other shells in that it only provides as few commands as +built-ins as possible and has a daemon which allows it to have +shared variables and command-line history between shell instances. +It also features feature-rich tab-completion and has command-line +syntax highlighting. diff --git a/shells/fish/Makefile b/shells/fish/Makefile new file mode 100644 index 00000000000..8a11b9dbf5b --- /dev/null +++ b/shells/fish/Makefile @@ -0,0 +1,35 @@ +# $NetBSD: Makefile,v 1.1 2012/12/12 13:21:42 wiz Exp $ +# + +DISTNAME= fish-1.23.1 +CATEGORIES= shells +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fish/} + +MAINTAINER= pkgsrc-users@NetBSD.org +HOMEPAGE= http://www.fishshell.org/ +COMMENT= User friendly command line shell for UNIX-like operating systems +LICENSE= gnu-gpl-v2 + +BUILD_DEPENDS+= doxygen>=1.2.14:../../devel/doxygen + +GNU_CONFIGURE= yes +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --without-xsel +USE_TOOLS+= gmake + +EGDIR= ${PREFIX}/share/examples/fish +INSTALL_ENV+= EGDIR=${EGDIR} + +PKG_SHELL= bin/fish + +.include "../../mk/bsd.prefs.mk" + +# backtrace() and backtrace_symbols were added in NetBSD-6.99.8 +.if !empty(MACHINE_PLATFORM:MNetBSD-*) && empty(MACHINE_PLATFORM:MNetBSD-[0-5].*) && empty(MACHINE_PLATFORM:MNetBSD-6.99.[0-7].*) +CPPFLAGS+= -DHAVE_BACKTRACE +CPPFLAGS+= -DHAVE_BACKTRACE_SYMBOLS +LDFLAGS+= -lexecinfo +.endif + +.include "../../mk/curses.buildlink3.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/shells/fish/PLIST b/shells/fish/PLIST new file mode 100644 index 00000000000..2a7d30480d2 --- /dev/null +++ b/shells/fish/PLIST @@ -0,0 +1,418 @@ +@comment $NetBSD: PLIST,v 1.1 2012/12/12 13:21:42 wiz Exp $ +bin/fish +bin/fish_indent +bin/fish_pager +bin/fishd +bin/mimedb +bin/set_color +man/man1/fish.1 +man/man1/fish_indent.1 +man/man1/fish_pager.1 +man/man1/fishd.1 +man/man1/mimedb.1 +man/man1/set_color.1 +share/doc/fish/ChangeLog +share/doc/fish/commands.html +share/doc/fish/design.html +share/doc/fish/doc_8h-source.html +share/doc/fish/doxygen.css +share/doc/fish/doxygen.png +share/doc/fish/faq.html +share/doc/fish/files.html +share/doc/fish/index.html +share/doc/fish/license.html +share/doc/fish/pages.html +share/doc/fish/tab_b.gif +share/doc/fish/tab_l.gif +share/doc/fish/tab_r.gif +share/doc/fish/tabs.css +share/examples/fish/fish/config.fish +share/fish/completions/acpi.fish +share/fish/completions/adduser.fish +share/fish/completions/and.fish +share/fish/completions/ant.fish +share/fish/completions/apm.fish +share/fish/completions/apropos.fish +share/fish/completions/apt-build.fish +share/fish/completions/apt-cache.fish +share/fish/completions/apt-cdrom.fish +share/fish/completions/apt-config.fish +share/fish/completions/apt-extracttemplates.fish +share/fish/completions/apt-file.fish +share/fish/completions/apt-ftparchive.fish +share/fish/completions/apt-get.fish +share/fish/completions/apt-key.fish +share/fish/completions/apt-listbugs.fish +share/fish/completions/apt-listchanges.fish +share/fish/completions/apt-move.fish +share/fish/completions/apt-proxy-import.fish +share/fish/completions/apt-rdepends.fish +share/fish/completions/apt-setup.fish +share/fish/completions/apt-show-source.fish +share/fish/completions/apt-show-versions.fish +share/fish/completions/apt-sortpkgs.fish +share/fish/completions/apt-spy.fish +share/fish/completions/apt-src.fish +share/fish/completions/apt-zip-inst.fish +share/fish/completions/apt-zip-list.fish +share/fish/completions/aptitude.fish +share/fish/completions/arp.fish +share/fish/completions/at.fish +share/fish/completions/atd.fish +share/fish/completions/atq.fish +share/fish/completions/atrm.fish +share/fish/completions/awk.fish +share/fish/completions/badblocks.fish +share/fish/completions/bc.fish +share/fish/completions/bg.fish +share/fish/completions/bind.fish +share/fish/completions/bison.fish +share/fish/completions/block.fish +share/fish/completions/break.fish +share/fish/completions/btdownloadcurses.py.fish +share/fish/completions/btdownloadheadless.py.fish +share/fish/completions/builtin.fish +share/fish/completions/bunzip2.fish +share/fish/completions/bzcat.fish +share/fish/completions/bzip2.fish +share/fish/completions/bzip2recover.fish +share/fish/completions/case.fish +share/fish/completions/cat.fish +share/fish/completions/cd.fish +share/fish/completions/cdrecord.fish +share/fish/completions/chgrp.fish +share/fish/completions/chmod.fish +share/fish/completions/chown.fish +share/fish/completions/chsh.fish +share/fish/completions/command.fish +share/fish/completions/commandline.fish +share/fish/completions/complete.fish +share/fish/completions/configure.fish +share/fish/completions/continue.fish +share/fish/completions/cowsay.fish +share/fish/completions/cowthink.fish +share/fish/completions/cp.fish +share/fish/completions/cut.fish +share/fish/completions/cvs.fish +share/fish/completions/darcs.fish +share/fish/completions/date.fish +share/fish/completions/dcop.fish +share/fish/completions/df.fish +share/fish/completions/diff.fish +share/fish/completions/du.fish +share/fish/completions/dvipdf.fish +share/fish/completions/dvipdfm.fish +share/fish/completions/echo.fish +share/fish/completions/effectv.fish +share/fish/completions/eix-sync.fish +share/fish/completions/eix.fish +share/fish/completions/elatex.fish +share/fish/completions/emacs.fish +share/fish/completions/emerge.fish +share/fish/completions/env.fish +share/fish/completions/equery.fish +share/fish/completions/etex.fish +share/fish/completions/eval.fish +share/fish/completions/evince.fish +share/fish/completions/exec.fish +share/fish/completions/exit.fish +share/fish/completions/fg.fish +share/fish/completions/file.fish +share/fish/completions/find.fish +share/fish/completions/fish.fish +share/fish/completions/fish_indent.fish +share/fish/completions/flac.fish +share/fish/completions/function.fish +share/fish/completions/functions.fish +share/fish/completions/fusermount.fish +share/fish/completions/gcc.fish +share/fish/completions/gdb.fish +share/fish/completions/gem.fish +share/fish/completions/git.fish +share/fish/completions/gpg.fish +share/fish/completions/gprof.fish +share/fish/completions/grep.fish +share/fish/completions/groupadd.fish +share/fish/completions/gunzip.fish +share/fish/completions/gzip.fish +share/fish/completions/help.fish +share/fish/completions/hg.fish +share/fish/completions/iconv.fish +share/fish/completions/id.fish +share/fish/completions/ifconfig.fish +share/fish/completions/invoke-rc.d.fish +share/fish/completions/jobs.fish +share/fish/completions/kill.fish +share/fish/completions/la.fish +share/fish/completions/latex.fish +share/fish/completions/less.fish +share/fish/completions/ll.fish +share/fish/completions/locate.fish +share/fish/completions/ls.fish +share/fish/completions/m4.fish +share/fish/completions/make.fish +share/fish/completions/makedepend.fish +share/fish/completions/makepkg.fish +share/fish/completions/man.fish +share/fish/completions/mimedb.fish +share/fish/completions/modprobe.fish +share/fish/completions/mount.fish +share/fish/completions/mplayer.fish +share/fish/completions/msgfmt.fish +share/fish/completions/mutt.fish +share/fish/completions/mv.fish +share/fish/completions/netcat.fish +share/fish/completions/nextd.fish +share/fish/completions/nice.fish +share/fish/completions/not.fish +share/fish/completions/oggenc.fish +share/fish/completions/omega.fish +share/fish/completions/or.fish +share/fish/completions/pacman.fish +share/fish/completions/patch.fish +share/fish/completions/pdfelatex.fish +share/fish/completions/pdfetex.fish +share/fish/completions/pdflatex.fish +share/fish/completions/pdftex.fish +share/fish/completions/perl.fish +share/fish/completions/pine.fish +share/fish/completions/ping.fish +share/fish/completions/pkgadd.fish +share/fish/completions/pkginfo.fish +share/fish/completions/pkgmk.fish +share/fish/completions/pkgrm.fish +share/fish/completions/ports.fish +share/fish/completions/prevd.fish +share/fish/completions/prt-get.fish +share/fish/completions/ps.fish +share/fish/completions/ps2pdf.fish +share/fish/completions/psub.fish +share/fish/completions/pushd.fish +share/fish/completions/python.fish +share/fish/completions/quilt.fish +share/fish/completions/random.fish +share/fish/completions/read.fish +share/fish/completions/rejmerge.fish +share/fish/completions/renice.fish +share/fish/completions/return.fish +share/fish/completions/rm.fish +share/fish/completions/rmdir.fish +share/fish/completions/rpm.fish +share/fish/completions/rsync.fish +share/fish/completions/ruby.fish +share/fish/completions/scons.fish +share/fish/completions/scp.fish +share/fish/completions/screen.fish +share/fish/completions/sed.fish +share/fish/completions/service.fish +share/fish/completions/set.fish +share/fish/completions/set_color.fish +share/fish/completions/sort.fish +share/fish/completions/ssh.fish +share/fish/completions/sshfs.fish +share/fish/completions/status.fish +share/fish/completions/su.fish +share/fish/completions/sudo.fish +share/fish/completions/svn.fish +share/fish/completions/sylpheed.fish +share/fish/completions/tar.fish +share/fish/completions/telnet.fish +share/fish/completions/test.fish +share/fish/completions/tex.fish +share/fish/completions/time.fish +share/fish/completions/top.fish +share/fish/completions/totem.fish +share/fish/completions/touch.fish +share/fish/completions/trap.fish +share/fish/completions/type.fish +share/fish/completions/ulimit.fish +share/fish/completions/umount.fish +share/fish/completions/uname.fish +share/fish/completions/uniq.fish +share/fish/completions/unrar.fish +share/fish/completions/update-eix-remote.fish +share/fish/completions/update-eix.fish +share/fish/completions/useradd.fish +share/fish/completions/valgrind.fish +share/fish/completions/vared.fish +share/fish/completions/vi.fish +share/fish/completions/vim.fish +share/fish/completions/w.fish +share/fish/completions/wajig.fish +share/fish/completions/wc.fish +share/fish/completions/wesnoth.fish +share/fish/completions/wget.fish +share/fish/completions/whatis.fish +share/fish/completions/which.fish +share/fish/completions/who.fish +share/fish/completions/wpa_cli.fish +share/fish/completions/xargs.fish +share/fish/completions/xgettext.fish +share/fish/completions/xmms.fish +share/fish/completions/xpdf.fish +share/fish/completions/xprop.fish +share/fish/completions/xsel.fish +share/fish/completions/xterm.fish +share/fish/completions/yum.fish +share/fish/completions/zcat.fish +share/fish/completions/zip.fish +share/fish/config.fish +share/fish/functions/N_.fish +share/fish/functions/_.fish +share/fish/functions/__fish_append.fish +share/fish/functions/__fish_bind_test1.fish +share/fish/functions/__fish_bind_test2.fish +share/fish/functions/__fish_commandline_test.fish +share/fish/functions/__fish_complete_ant_targets.fish +share/fish/functions/__fish_complete_bittorrent.fish +share/fish/functions/__fish_complete_cd.fish +share/fish/functions/__fish_complete_command.fish +share/fish/functions/__fish_complete_directories.fish +share/fish/functions/__fish_complete_file_url.fish +share/fish/functions/__fish_complete_groups.fish +share/fish/functions/__fish_complete_ls.fish +share/fish/functions/__fish_complete_man.fish +share/fish/functions/__fish_complete_mime.fish +share/fish/functions/__fish_complete_pids.fish +share/fish/functions/__fish_complete_ssh.fish +share/fish/functions/__fish_complete_subcommand.fish +share/fish/functions/__fish_complete_subcommand_root.fish +share/fish/functions/__fish_complete_suffix.fish +share/fish/functions/__fish_complete_tar.fish +share/fish/functions/__fish_complete_tex.fish +share/fish/functions/__fish_complete_unrar.fish +share/fish/functions/__fish_complete_users.fish +share/fish/functions/__fish_complete_vi.fish +share/fish/functions/__fish_config_interactive.fish +share/fish/functions/__fish_contains_opt.fish +share/fish/functions/__fish_crux_packages.fish +share/fish/functions/__fish_describe_command.fish +share/fish/functions/__fish_filter_ant_targets.fish +share/fish/functions/__fish_filter_mime.fish +share/fish/functions/__fish_git_branch_prompt.fish +share/fish/functions/__fish_gnu_complete.fish +share/fish/functions/__fish_is_first_token.fish +share/fish/functions/__fish_list_current_token.fish +share/fish/functions/__fish_move_last.fish +share/fish/functions/__fish_no_arguments.fish +share/fish/functions/__fish_not_contain_opt.fish +share/fish/functions/__fish_paginate.fish +share/fish/functions/__fish_ports_dirs.fish +share/fish/functions/__fish_print_addresses.fish +share/fish/functions/__fish_print_debian_services.fish +share/fish/functions/__fish_print_encodings.fish +share/fish/functions/__fish_print_filesystems.fish +share/fish/functions/__fish_print_function_prototypes.fish +share/fish/functions/__fish_print_help.fish +share/fish/functions/__fish_print_hostnames.fish +share/fish/functions/__fish_print_interfaces.fish +share/fish/functions/__fish_print_make_targets.fish +share/fish/functions/__fish_print_packages.fish +share/fish/functions/__fish_print_users.fish +share/fish/functions/__fish_prt_no_subcommand.fish +share/fish/functions/__fish_prt_packages.fish +share/fish/functions/__fish_prt_ports.fish +share/fish/functions/__fish_prt_use_package.fish +share/fish/functions/__fish_prt_use_port.fish +share/fish/functions/__fish_seen_subcommand_from.fish +share/fish/functions/__fish_test_arg.fish +share/fish/functions/__fish_use_subcommand.fish +share/fish/functions/alias.fish +share/fish/functions/cd.fish +share/fish/functions/delete-or-exit.fish +share/fish/functions/dirh.fish +share/fish/functions/dirs.fish +share/fish/functions/down-or-search.fish +share/fish/functions/eval.fish +share/fish/functions/fish_default_key_bindings.fish +share/fish/functions/fish_prompt.fish +share/fish/functions/funced.fish +share/fish/functions/funcsave.fish +share/fish/functions/grep.fish +share/fish/functions/help.fish +share/fish/functions/isatty.fish +share/fish/functions/la.fish +share/fish/functions/ll.fish +share/fish/functions/ls.fish +share/fish/functions/math.fish +share/fish/functions/nextd-or-forward-word.fish +share/fish/functions/nextd.fish +share/fish/functions/open.fish +share/fish/functions/popd.fish +share/fish/functions/prevd-or-backward-word.fish +share/fish/functions/prevd.fish +share/fish/functions/prompt_pwd.fish +share/fish/functions/psub.fish +share/fish/functions/pushd.fish +share/fish/functions/pwd.fish +share/fish/functions/setenv.fish +share/fish/functions/sgrep.fish +share/fish/functions/trap.fish +share/fish/functions/type.fish +share/fish/functions/umask.fish +share/fish/functions/up-or-search.fish +share/fish/functions/vared.fish +share/fish/man/alias.1 +share/fish/man/and.1 +share/fish/man/begin.1 +share/fish/man/bg.1 +share/fish/man/bind.1 +share/fish/man/block.1 +share/fish/man/break.1 +share/fish/man/breakpoint.1 +share/fish/man/builtin.1 +share/fish/man/case.1 +share/fish/man/cd.1 +share/fish/man/command.1 +share/fish/man/commandline.1 +share/fish/man/complete.1 +share/fish/man/contains.1 +share/fish/man/continue.1 +share/fish/man/count.1 +share/fish/man/dirh.1 +share/fish/man/dirs.1 +share/fish/man/else.1 +share/fish/man/emit.1 +share/fish/man/end.1 +share/fish/man/eval.1 +share/fish/man/exec.1 +share/fish/man/exit.1 +share/fish/man/fg.1 +share/fish/man/fish.1 +share/fish/man/fish_indent.1 +share/fish/man/fish_pager.1 +share/fish/man/fish_prompt.1 +share/fish/man/fishd.1 +share/fish/man/for.1 +share/fish/man/funced.1 +share/fish/man/funcsave.1 +share/fish/man/function.1 +share/fish/man/functions.1 +share/fish/man/help.1 +share/fish/man/if.1 +share/fish/man/isatty.1 +share/fish/man/jobs.1 +share/fish/man/math.1 +share/fish/man/mimedb.1 +share/fish/man/nextd.1 +share/fish/man/not.1 +share/fish/man/open.1 +share/fish/man/or.1 +share/fish/man/popd.1 +share/fish/man/prevd.1 +share/fish/man/psub.1 +share/fish/man/pushd.1 +share/fish/man/random.1 +share/fish/man/read.1 +share/fish/man/return.1 +share/fish/man/set.1 +share/fish/man/set_color.1 +share/fish/man/source.1 +share/fish/man/status.1 +share/fish/man/switch.1 +share/fish/man/trap.1 +share/fish/man/type.1 +share/fish/man/ulimit.1 +share/fish/man/umask.1 +share/fish/man/vared.1 +share/fish/man/while.1 diff --git a/shells/fish/distinfo b/shells/fish/distinfo new file mode 100644 index 00000000000..4f1d8e32fc6 --- /dev/null +++ b/shells/fish/distinfo @@ -0,0 +1,9 @@ +$NetBSD: distinfo,v 1.1 2012/12/12 13:21:42 wiz Exp $ + +SHA1 (fish-1.23.1.tar.gz) = 7b839ffc5b260f1bd1782e4adf84300f5438f833 +RMD160 (fish-1.23.1.tar.gz) = b77fe7ffec4ae52b82c1c86b2dc7037306c5fede +Size (fish-1.23.1.tar.gz) = 1152997 bytes +SHA1 (patch-Makefile.in) = d92c531cb15e511f1a712d98a64e222b3316fcdd +SHA1 (patch-configure) = 3d4cd5ed6cff65768f4f99ae196449e01d3f7ef1 +SHA1 (patch-proc.h) = 7ac0b704f6ee1b1e966f0bfdc87dfa1e23e9c338 +SHA1 (patch-screen.c) = eae536bb965bd2a236a5cd3ff44e5ddbeb24f519 diff --git a/shells/fish/patches/patch-Makefile.in b/shells/fish/patches/patch-Makefile.in new file mode 100644 index 00000000000..7ff8360bab3 --- /dev/null +++ b/shells/fish/patches/patch-Makefile.in @@ -0,0 +1,21 @@ +$NetBSD: patch-Makefile.in,v 1.1 2012/12/12 13:21:42 wiz Exp $ + +Install configuration files to EGDIR + +--- Makefile.in.orig 2009-03-08 14:46:47.000000000 +0000 ++++ Makefile.in +@@ -569,12 +569,12 @@ install-force: all install-translations + for i in $(PROGRAMS); do\ + $(INSTALL) -m 755 $$i $(DESTDIR)$(bindir) ; \ + done; +- $(INSTALL) -m 755 -d $(DESTDIR)$(sysconfdir)/fish ++ $(INSTALL) -m 755 -d $(DESTDIR)$(EGDIR)/fish + $(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/fish + $(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/fish/completions + $(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/fish/functions + $(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/fish/man +- $(INSTALL) -m 644 etc/config.fish $(DESTDIR)$(sysconfdir)/fish/ ++ $(INSTALL) -m 644 etc/config.fish $(DESTDIR)$(EGDIR)/fish/ + $(INSTALL) -m 644 share/config.fish $(DESTDIR)$(datadir)/fish/ + for i in $(COMPLETIONS_DIR_FILES); do \ + $(INSTALL) -m 644 $$i $(DESTDIR)$(datadir)/fish/completions/; \ diff --git a/shells/fish/patches/patch-configure b/shells/fish/patches/patch-configure new file mode 100644 index 00000000000..f756c2d2f31 --- /dev/null +++ b/shells/fish/patches/patch-configure @@ -0,0 +1,15 @@ +$NetBSD: patch-configure,v 1.1 2012/12/12 13:21:42 wiz Exp $ + +Expand variable where it's defined + +--- configure.orig 2009-03-08 14:46:47.000000000 +0000 ++++ configure +@@ -740,7 +740,7 @@ sharedstatedir='${prefix}/com' + localstatedir='${prefix}/var' + includedir='${prefix}/include' + oldincludedir='/usr/include' +-docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' ++docdir='${datarootdir}/doc/'"${PACKAGE_TARNAME}" + infodir='${datarootdir}/info' + htmldir='${docdir}' + dvidir='${docdir}' diff --git a/shells/fish/patches/patch-proc.h b/shells/fish/patches/patch-proc.h new file mode 100644 index 00000000000..1955ec60fe5 --- /dev/null +++ b/shells/fish/patches/patch-proc.h @@ -0,0 +1,15 @@ +$NetBSD: patch-proc.h,v 1.1 2012/12/12 13:21:42 wiz Exp $ + +Fix missing include + +--- proc.h.orig 2009-03-08 14:46:47.000000000 +0000 ++++ proc.h +@@ -16,6 +16,8 @@ + #include + #include + ++#include ++ + #include "util.h" + #include "io.h" + diff --git a/shells/fish/patches/patch-screen.c b/shells/fish/patches/patch-screen.c new file mode 100644 index 00000000000..12f6d6a9f89 --- /dev/null +++ b/shells/fish/patches/patch-screen.c @@ -0,0 +1,24 @@ +$NetBSD: patch-screen.c,v 1.1 2012/12/12 13:21:42 wiz Exp $ + +Fix compilation on NetBSD, where init_tabs is not suitable for assignment. + +--- screen.c.orig 2009-03-08 14:46:47.000000000 +0000 ++++ screen.c +@@ -92,13 +93,14 @@ static int try_sequence( char *seq, wcha + */ + static int next_tab_stop( int in ) + { ++ int itabs = init_tabs; + /* + Assume tab stops every 8 characters if undefined + */ +- if( init_tabs <= 0 ) +- init_tabs = 8; ++ if( itabs <= 0 ) ++ itabs = 8; + +- return ( (in/init_tabs)+1 )*init_tabs; ++ return ( (in/itabs)+1 )*itabs; + } + + /** -- cgit v1.2.3