Commit Graph

153 Commits

Author SHA1 Message Date
Wolfram Schneider
5a80fb277e sync copyright with /usr/share/examples/etc/bsd-style-copyright 1996-08-27 20:04:45 +00:00
Andrey A. Chernov
21045c6802 Restore my backed out changes (writting cats) because they was
not reviewed by pst in claimed period (1 week) and over 3 weeks passed.
CONSTRUCTIVE complaints welcome!
1996-07-09 15:37:26 +00:00
Wolfram Schneider
e3908fd51f add manpage getNAME(1) 1996-07-08 20:18:28 +00:00
Wolfram Schneider
bfab15f069 Exits 0 on success, and 1 if no keyword matched.
Start $PAGER only if we find a manual page.
1996-07-08 20:03:18 +00:00
Jordan K. Hubbard
cd9a2f5c28 Bring in my changes for removing the pestilent obj links (unless you
really want them) from /usr/src.  This is the final version of the
patches, incorporating the feedback I've received from -current.
1996-06-24 04:26:21 +00:00
Andrey A. Chernov
14970a0492 Back out security changes until pst review them 1996-06-22 21:10:19 +00:00
Andrey A. Chernov
55c148f316 Do not produce empty cat file in debug mode 1996-06-22 08:05:11 +00:00
Andrey A. Chernov
b08645daa4 Close security holes and restore suid bit
Restore writting cat's functionality
1996-06-21 18:49:36 +00:00
Lars Fredriksen
24161867cf Reviewed by: joerg
Change man so that it will still display the man page even if it
cannot create a "cat" file.
1996-06-01 03:19:59 +00:00
Paul Traina
3ad4f8a0b7 Remove setuid bit, it's not necessary. 1996-05-22 15:53:38 +00:00
Paul Traina
ee8d2caadc Call groff directly instead of using nroff shell script.
Submitted by:	peter
1996-05-22 15:53:19 +00:00
Wolfram Schneider
d1c1415248 New option -append: teach makewhatis to only add records, instead
of clobbering the entire database.

sort options in alphabetic order.

install manpage makewhatis.local.8
1996-05-22 00:57:42 +00:00
Jordan K. Hubbard
8f4196ac5e Invoke proper gzip 1996-05-20 12:52:08 +00:00
Wolfram Schneider
60fa1b8390 Makewhatis appended the filename to list of keywords if no keyword
matched the filename. Now put the list after the filename. E.g.

filename: vt220keys.1
Keyword: vt220

was: vt220(1), vt220keys(1)   - define SHIFTED [...]
now: vt220keys(1), vt220(1)   - define SHIFTED [...]
1996-05-14 23:07:05 +00:00
Wolfram Schneider
7d732d1e4f Bugfix: nested *?+ in regexp at /usr/bin/makewhatis line 286
Submitted by: invalid opcode <coredump@nervosa.com>

makewhatis.local - start makewhatis(1) only for file systems
                   physically mounted on the system
Running makewhatis from /etc/weekly for rw nfs-mounted /usr may kill
your NFS server -- all clients start makewhatis at the same time!
So use this wrapper instead calling makewhatis directly.

Pointed out by: Bruce
1996-05-12 21:02:04 +00:00
Mike Pritchard
edf0e5b3f8 Correct some man page xrefs, and some other minor changes to bring some
man pages up to mdoc guidelines and fix some minor formatting glitches.
Also fixed a number of man pages to not abuse the .Xr macro to
display functions and path names and a lot of other junk.
1996-04-08 04:18:31 +00:00
Wolfram Schneider
3974bcb043 Don't count character ``+'' as garbage (c++.1, flex++.1)
Submitted by: joerg
1996-03-21 18:17:41 +00:00
Wolfram Schneider
242e35141e remove ``whatis'' 1996-03-10 18:59:11 +00:00
Wolfram Schneider
d31934acb9 share the code between apropos and whatis 1996-03-10 18:52:33 +00:00
Wolfram Schneider
d37cc74768 print error messages to stderr
don't fail if search arguments contain spaces
allow programs from $PATH as PAGER
faster
1996-02-25 23:41:46 +00:00
Bruce Evans
463c7e7ac6 Use ${ECHO} instead of echo' so that make -s' is fairly quiet. 1996-02-25 20:25:05 +00:00
Wolfram Schneider
cc54f38c51 making <page>.1 from <page>.man 1996-02-06 23:48:03 +00:00
Wolfram Schneider
98b1043eab man.1 depend on man.man 1996-01-24 00:22:27 +00:00
Wolfram Schneider
7848c5e3b3 manpath.1 depend on manpath.man 1996-01-24 00:18:29 +00:00
Joerg Wunsch
09a9d67790 `-w' was actually a flag, not an option... 1996-01-23 21:27:39 +00:00
Joerg Wunsch
216f442d13 Add a hint that the -w flag to catman(1) is actually the command
wakewhatis(1) for us.

Closes PR # docs/966

Submitted by:	obrien@cs.ucdavis.edu (David E. O'Brien)
1996-01-23 21:09:39 +00:00
Bruce Evans
5d391de1d4 Search section 9. 1996-01-23 14:03:26 +00:00
Mike Pritchard
3f1cd88fb3 Change the reference to less(1) (which may not be installed) to more(1).
Closed PR# 847.
1996-01-22 09:25:45 +00:00
Peter Wemm
a5b996a7ec recording cvs-1.6 file death 1995-12-30 19:02:48 +00:00
Jordan K. Hubbard
9f07bf9833 Comment out /usr/X386/man entry from MANDATORY_MANPATH - it's obsolete.
Submitted by:	mi@ALDAN.star89.galstar.com
1995-11-28 19:03:20 +00:00
Bruce Evans
03e5b81db4 Rewrite and merge some bogus makefiles to create Makefile.shprog. Just
include this in the old makefiles.

I intended to fix only the private maninstall rule but found a lot of
other bogons and bugs:
- strong resistance to installing the program anywhere other than
  ${DESTDIR}/usr/bin (first, ../../Makefile.inc was not included.
  ../Makefile/inc was redundantly included instead.  Second, /usr/bin
  was hard coded).
- the owner, group and permissions were hard coded.
- the man page was installed twice.
- MANDEPEND wasn't necessary.
- calculations to determine the obj directory weren't necessary.
- there were unnecessary private rules for depend, rcsfreeze and tags.
  We don't support the rcsfreeze target.
- there was an extra, bogus, rule for `all'.

The final version uses suffix rules to eliminate the remaining verboseness
involving directories (${.CURDIR}) and to potentially allow multiple
shell programs in one directory.
1995-10-21 14:27:19 +00:00
Joerg Wunsch
6f4da234fb Fix a few minor bugs in makewhatis.
Submitted by:	wosch@cs.tu-berlin.de (Wolfram Schneider)
1995-09-10 13:05:52 +00:00
Bruce Evans
9c0dc173cc Change install' to ${INSTALL}' so that default install flags can be
specified in the top level Makefiles.
1995-07-25 00:37:58 +00:00
Rodney W. Grimes
4399be3cbd Remove trailing whitespace. 1995-05-30 05:05:38 +00:00
Andrey A. Chernov
7b9728ce0b Don't chdir to subdirs before formatting, non-native manpages
assume it for .so directive
Submitted by: Wolfram Schneider <wosch@cs.tu-berlin.de>
1995-05-20 19:02:53 +00:00
Rodney W. Grimes
ba0879629f Submitted by: Charles Henrich <henrich@fubar.cl.msu.edu>
Quite up man when directories in MANPATH do not exist.  If you want
it to tell you about problems use man -d.
1995-05-12 04:56:28 +00:00
Joerg Wunsch
d2b27ba8b6 From Wolfram: Fix: typos, old links
Submitted by:	wosch@cs.tu-berlin.de (Wolfram Schneider)
1995-05-06 19:04:07 +00:00
Jordan K. Hubbard
4b1e0d1665 Close this PR:
>Number:         364
>Category:       bin
>Synopsis:       Interrupting man results in half-baked man page
>Description:

Interrupting man while it is waiting for the page to be formatted
results in a zero length file or a half-baked file.

>How-To-Repeat:

Inetrrupt man while it is formatting a page.

>Fix:

Pay more attention to the return value from the system command.
Submitted by:	John Capo <jc@irbs.com>
1995-04-26 16:19:23 +00:00
Joerg Wunsch
c8a2ad770c Fix broken file name globbing. Man is now also able to find pages
like "3DBorder" and "[".  (NB, the "3DBorder" problem has actually
been intention, it allowed for weird section names like "3xyzzy".  We
don't have them, either.)

(Partially) Submitted by:	taob@gate.sinica.edu.tw (Brian Tao)
1995-04-11 22:01:53 +00:00
Joerg Wunsch
f000edcf92 Fix the
Ignore wrong indent value: ``''

bug, as reported by Chris Kukulies.
1995-04-01 11:43:09 +00:00
Joerg Wunsch
c0106644ad Wolfram's latest update.
Submitted by:	wosch@cs.tu-berlin.de (Wolfram Schneider)
1995-03-31 04:00:53 +00:00
Jean-Marc Zucconi
509b93f067 'directories...' is an argument, not an option 1995-03-27 01:52:59 +00:00
Andrey A. Chernov
e831146aee Don't use user PATH into environment for sec reasons 1995-03-18 02:19:25 +00:00
Andrey A. Chernov
24e24f916f 1) Call nroff instead of groff, nroff have some internal groff options
2) Use absolute pathname for nroff
3) Use -Tascii instead -Tlatin1, too many strange chars (like
soft hyphens f.e.) appearse in other case.
1995-03-18 02:11:56 +00:00
Joerg Wunsch
01e694c2e2 Wolfram's replacement for the oldish ugly catman(1) program. The new
one is much more intelligent, not only that it would accept multiple
man page locations, it also behaves like ``make'' in that it will only
deal with cat pages that are out of date (by default).

Wolfram also wrote a man page for it.

Submitted by:	wosch@cs.tu-berlin.de (Wolfram Schneider)
1995-03-15 22:47:38 +00:00
Paul Richards
0d09ae1111 Change the return status of do_system_command to be -1
if a signal is received.

This fixes a bug where killing the process would cause a
"No manual entry for XXX" to be printed even if the manpage
was found.
1995-03-09 19:56:23 +00:00
Joerg Wunsch
def5a1b108 Patch bei Wolfram to avoid processing duplicate directories.
Submitted by:	wosch@cs.tu-berlin.de (Wolfram Schneider)
1995-02-26 19:35:06 +00:00
Bruce Evans
eac78dccac Install manpath.config.sample with the correct mode. It should be installed
elsewhere.
1995-02-26 03:03:15 +00:00
Joerg Wunsch
27dd3ef3b9 Wolfram now also submitted a man page for this.
Submitted by:	Wolfram Schneider <wosch@cs.tu-berlin.de>
1995-02-15 22:52:52 +00:00
Andrey A. Chernov
8af44ad204 Use nroff instead of groff in %nroff% macro, becasue
nroff shell script pass additional internal parameters to groff
1995-01-17 21:12:05 +00:00
Andrey A. Chernov
603ef010b6 Back out my ascii->latin1 change, too many special chars
appearse after it (f.e. hyphentate and such) which looks
very different in different code pages
1995-01-16 17:18:03 +00:00
Garrett Wollman
c81d9b5121 Turn off incredibly obnoxious forced -c' option to more'. 1995-01-14 20:09:47 +00:00
Andrey A. Chernov
21984e24b4 Use -Tlatin1 instead -Tascii to pass character from
S0ren name without warnings.
1995-01-13 00:42:04 +00:00
Joerg Wunsch
056dfea8f8 argl, better unzip the perl script before installing. :-/ 1995-01-11 09:21:29 +00:00
Joerg Wunsch
43c1db28c7 From our favorite Perl script writer: a new makewhatis, about
15 times faster than the existing sh script.

Submitted by:   Wolfram Schneider <wosch@cs.tu-berlin.de>
1995-01-10 18:12:50 +00:00
Jordan K. Hubbard
5c52037561 Remove /usr/gnu from mandatory manpath. 1994-11-22 09:57:42 +00:00
Bruce Evans
069fcad2d9 Clean up some foreign makefiles a bit, attempting to handle .sh files
more like binaries.  This is hard to do using a general rules because
the natural `.sh:' rule has a null suffix and null suffixes are broken.
(With 1.1.5's make they sometimes work and sometimes cause core dumps.
2.0's make has a botched fixed and they never work.)
1994-11-14 05:57:36 +00:00
Bruce Evans
85b64443ae Use standard clean, cleandir and obj targets.
Don't use $@.

Uniformize the man Makefiles for shell scripts.  It should't take such
large Makefiles to install one script and one man page each.
1994-08-28 18:33:48 +00:00
Bruce Evans
6ad617743b Remove stale clone of obj target. 1994-08-28 18:25:55 +00:00
Bruce Evans
e4d49cce30 Fixed Makefile for make depend some more. The .depend target was not
being created and config.h depended on Makefile.inc being in the wrong
directory so real dependencies were not being checked.  The "depend"
target was not created either so "make depend" always found work to do.
1994-08-25 08:36:26 +00:00
Jordan K. Hubbard
bd240d5233 From: Tom Pavel <PAVEL@SLAC.Stanford.EDU>
Subject: man returns 1

In 1.1.5.1, man returns a status of 1 if the lookup succeeds and 0 if
it fails.  Here is a patch for what I believe is a simple oversight:

Submitted by:	jkh
1994-08-24 07:26:23 +00:00
Geoff Rehmet
fe88cc599b Make these Makefiles work properly when NOMAN is defined.
(I wish they just used bsd.prog.mk)
1994-06-05 21:57:16 +00:00
Geoff Rehmet
67bc1dabe4 Manual pages are now installed via the bsd.man.mk macro, since the
existing arrangement in this makefile doesn't allow for compressed
manual pages.
1994-06-05 20:39:58 +00:00
Geoff Rehmet
7a34df0d8f Turn globbing on when a section number is specified, this makes things work
properly when /usr/share/man/man?/ contain gzipped unformatted pages.
1994-05-28 20:19:25 +00:00
Andrey A. Chernov
4039f70287 Fix catman to produce zipped cats, like man does.
In other (old) case we have both kind of cats at once.
1994-05-23 22:13:36 +00:00
Jordan K. Hubbard
c3331fde7e Stop toasting folks' /etc/manpath.config files. 1994-05-17 12:50:36 +00:00
Rich Murphey
aa8b11faa3 Add X11R6 to manpath in preprataion for XFree86 3.0. 1994-05-17 11:26:12 +00:00
Andreas Schulz
b48301f54f Changed the Makefiles for catman and makewhatis that the output from the
sed goes into an obj dir, if it exists, instead of the src dir.
1994-04-13 19:54:43 +00:00
Jordan K. Hubbard
4540f59ffb Something bogus happened here; not sure what or how.
Fixed.
1994-03-23 18:50:57 +00:00
Jordan K. Hubbard
cf92a93503 Make man the default owner, don't bother with sgid. 1994-03-19 22:25:17 +00:00
Jordan K. Hubbard
f43a065a65 Correct pre-installation target. 1994-03-19 22:24:48 +00:00
Jordan K. Hubbard
8951219578 Change group id to man 1994-03-18 11:55:53 +00:00
Jordan K. Hubbard
d86aaf74ed Make man sgid bin, not sgid AND suid. There is no reason to make man suid
bin since all you need to do is make the cat dirs group owned and writable
by bin - much less dangerous.
1994-03-16 13:05:31 +00:00
Jordan K. Hubbard
21eb6c6e63 New manpage compression support. Only one macro controls compression
now, DO_COMPRESS.  This controls whether or not catpages are compressed or
not (on by default, since little else uses the catpages and those few things
that do can always configure in a `zmore' in place of more or something, and
saving space is more important, IMHO).

Uncompression support is now on by default since that's the only way to support
mixed-mode environments.  If you don't like it, just don't compress your man
pages and it won't be used! :-).  Supports gzip.  You can also compress
the man pages themselves (or gzip them) now and it will work.
1994-03-05 13:48:38 +00:00
Jordan K. Hubbard
f67b5cb1cb Try copy if rename of temporary catpage fails. 1993-10-10 01:46:53 +00:00
Jordan K. Hubbard
b5d3f86c3f Handle both signals and errors in child processes, rather than just signals
as before.
1993-10-09 00:48:26 +00:00
Jordan K. Hubbard
570232738f Allow ^C to interrupt with some semblance of politeness to cgd. 1993-10-08 02:39:36 +00:00
Jordan K. Hubbard
1fdef8c67e More paranoid dealings with system() 1993-10-08 02:38:15 +00:00
Rodney W. Grimes
b3c17e952a Added bsd.prog.mk so that make maninstall would work 1993-09-08 14:23:28 +00:00
Nate Williams
501584c759 Cleaned up the Makefile to look nicer and not require a lot of hacks 1993-08-04 21:00:46 +00:00
Andrew Moore
af7f5fbec0 changed BINMODE= 6555 and CATMODE= 0664 1993-07-27 03:28:32 +00:00
Andrew Moore
e5082edc10 Added setreuid() calls so that shell escapes work.
The effective ID's need to be set to the real ID's before invoking
a shell for security reasons.
1993-07-27 02:54:46 +00:00
Andrew Moore
266f6fdff9 updated man to use more as the default pager 1993-07-26 19:41:13 +00:00
Andrew Moore
1b7072f477 changed find . -name '*' to find . -type f 1993-07-24 03:41:41 +00:00
Nate Williams
3244235258 Added ${DESTDIR} to all the naked install commands w/out them. 1993-07-23 08:23:19 +00:00
Jordan K. Hubbard
47dee7af0b Changes to make `maninstall' work. 1993-07-23 02:58:20 +00:00
Jordan K. Hubbard
9bd9789ec0 Added Christoph Robitschko's catman 1993-07-23 02:36:24 +00:00
Nate Williams
d696f8b647 Removed manpath.1 and added CLEANFILES directive to Makefile since it's
made automagically.
1993-07-21 21:37:54 +00:00
Nate Williams
7784cc2f09 Made makewhatis installed as 555 so that people could actually run it. 1993-07-21 21:37:20 +00:00
Andrew Moore
4a5e9a2017 added mandoc macro support;
each name now generates a separate whatis data base entry
1993-07-21 21:08:32 +00:00
Nate Williams
2aaed01e05 One last thing for making sure it works. 1993-07-21 20:48:37 +00:00
Jordan K. Hubbard
caa40a118a Changes to allow man to work with or without obj dirs. 1993-07-21 17:18:04 +00:00
Rodney W. Grimes
3b1dcbdd1a The install of manpath.config did not have a ${DESTDIR} in it. These
are needed on all install commands in Makefiles!
1993-07-20 02:13:11 +00:00
Jordan K. Hubbard
da9e1880f5 Added fix from Rich to accept catpages with .0 syntax for backwards
compatability (XFree86 man pages will still be .0'd for awhile).
1993-07-18 22:40:56 +00:00
Jordan K. Hubbard
6c8225df97 Fixed braindamage. 1993-07-18 05:52:29 +00:00
Rodney W. Grimes
4c860b3c23 Fixed make file for tags target, removed files that are generated by the
Makefile.
1993-07-17 06:20:35 +00:00
Rodney W. Grimes
49cf38bd01 Removed files that are generated by the Makefile. Fixed Makefile for
make depend so that config.h gets created so make depend does not fail
in other directories.
1993-07-17 06:06:28 +00:00
Rodney W. Grimes
9c30b1bfe1 Fixed make file for tags target, removed files that are generated by the
Makefile.
1993-07-17 06:05:35 +00:00
Rodney W. Grimes
2fb012f552 Added BINMODE=2555 so that it can write the man pages into /usr/share/man/catx.
This means the man dirs must be owned by group BIN.  I have set up the
distribution building tools to be that way.
1993-07-16 17:51:03 +00:00
Jordan K. Hubbard
402bc896a4 Whoops, forgot to add this one. 1993-07-16 06:48:59 +00:00