Commit 3fb78d1f authored by Glenn Morris's avatar Glenn Morris

Remove lib-src/b2m.c and b2m.pl.

Emacs does not use Babyl files since 23.1, and you can use M-x unrmail.

* msdos/mainmake.v2 (install): Remove b2m.

* lisp/emacs-lisp/authors.el (authors-valid-file-names): Add b2m.c.

* lib-src/b2m.c, lib-src/b2m.pl: Remove files.
* lib-src/Makefile.in (INSTALLABLES): Remove b2m.
* lib-src/makefile.w32-in ($(BLD)/b2m.$(O)): Remove.

* doc/emacs/ack.texi (Acknowledgments): No more b2m.c.

* admin/quick-install-emacs (PUBLIC_LIBSRC_BINARIES): Remove b2m.

* INSTALL, make-dist: Remove references to b2m.
* Makefile.in (MAN_PAGES): Remove b2m.1.
parent ea274122
2010-10-09 Glenn Morris <rgm@gnu.org>
* INSTALL, make-dist: Remove references to b2m.
* Makefile.in (MAN_PAGES): Remove b2m.1.
2010-10-05 Glenn Morris <rgm@gnu.org>
* .dir-locals.el: The Emacs convention is sentence-end-double-space.
......
......@@ -460,7 +460,7 @@ installed locations, with `make install'. By default, Emacs's files
are installed in the following directories:
`/usr/local/bin' holds the executable programs users normally run -
`emacs', `etags', `ctags', `b2m', `emacsclient',
`emacs', `etags', `ctags', `emacsclient',
`grep-changelog', and `rcs-checkin'.
`/usr/local/share/emacs/VERSION/lisp' holds the Emacs Lisp library;
......@@ -705,7 +705,7 @@ in `./lib-src' to their final destinations, as selected in `./src/epaths.h'.
Strictly speaking, not all of the executables in `./lib-src' need be copied.
- The programs `fakemail', `hexl', `movemail', `profile', `rcs2log',
and `vcdiff' are used by Emacs; they do need to be copied.
- The programs `etags', `ctags', `emacsclient', `b2m', and `rcs-checkin'
- The programs `etags', `ctags', `emacsclient', and `rcs-checkin'
are intended to be run by users; they are handled below.
- The programs `make-docfile' and `test-distrib' were
used in building Emacs, and are not needed any more.
......@@ -727,9 +727,9 @@ of installing different versions.
You can delete `./src/temacs'.
4) Copy the programs `b2m', `emacsclient', `ctags', `etags', and
`rcs-checkin' from `./lib-src' to `/usr/local/bin'. These programs are
intended for users to run.
4) Copy the programs `emacsclient', `ctags', `etags', and `rcs-checkin'
from `./lib-src' to `/usr/local/bin'. These programs are intended for
users to run.
5) Copy the man pages in `./doc/man' into the appropriate man directory.
......
......@@ -125,7 +125,7 @@ libexecdir=@libexecdir@
# (and they contain cross-references that expect them to be there).
mandir=@mandir@
man1dir=$(mandir)/man1
MAN_PAGES=b2m.1 ctags.1 ebrowse.1 emacs.1 emacsclient.1 etags.1 \
MAN_PAGES=ctags.1 ebrowse.1 emacs.1 emacsclient.1 etags.1 \
grep-changelog.1 rcs-checkin.1
# Where to install and expect the info files describing Emacs. In the
......
2010-10-09 Glenn Morris <rgm@gnu.org>
* quick-install-emacs (PUBLIC_LIBSRC_BINARIES): Remove b2m.
2010-09-05 Juanma Barranquero <lekktu@gmail.com>
* unidata/BidiMirroring.txt: Update from
......
......@@ -28,7 +28,7 @@
## install emacs very often. See the --help output for more details.
PUBLIC_LIBSRC_BINARIES='b2m emacsclient etags ctags ebrowse'
PUBLIC_LIBSRC_BINARIES='emacsclient etags ctags ebrowse'
PUBLIC_LIBSRC_SCRIPTS='grep-changelog rcs-checkin'
AVOID="CVS -DIC README COPYING ChangeLog ~ [.]orig$ [.]rej$ Makefile$ Makefile.in$ makefile$ makefile.w32-in$ stamp-subdir [.]cvsignore [.]arch-ids [{]arch[}] [.][cho]$ make-docfile testfile test-distrib"
......@@ -374,5 +374,3 @@ END {
done
) | eval $EXEC
# arch-tag: 9322b572-9755-4cf7-a67a-21e6505f1477
2010-10-09 Glenn Morris <rgm@gnu.org>
* ack.texi (Acknowledgments): No more b2m.c.
* Makefile.in (.PHONY): Declare info, dvi, pdf, dist.
(emacs): Remove rule.
(dist): No need to deal with the emacs rule any more.
......
......@@ -1320,10 +1320,6 @@ time spent on projects; the Baha'i calendar support;
Directory Client; and @code{eshell}, a command shell implemented
entirely in Emacs Lisp. He also contributed to Org mode (q.v.@:).
@item
Ed Wilkinson wrote @file{b2m.c}, a program to convert mail files from
RMAIL format to Unix @code{mbox} format.
@item
Mike Williams wrote @file{mouse-sel.el}, providing enhanced mouse
selection; and @file{thingatpt.el}, a library of functions for finding
......@@ -1418,7 +1414,3 @@ Detlev Zundel wrote @file{re-builder.el}, a package for building regexps
with visual feedback.
@end itemize
@ignore
arch-tag: bb1d0fa4-0240-4992-b5d4-8602d1e3d4ba
@end ignore
2010-10-09 Glenn Morris <rgm@gnu.org>
* b2m.c, b2m.pl: Remove files.
* Makefile.in (INSTALLABLES): Remove b2m.
* makefile.w32-in ($(BLD)/b2m.$(O)): Remove.
2010-10-08 Glenn Morris <rgm@gnu.org>
* emacsclient.c (set_local_socket) [DARWIN_OS]: Try as a fall-back
......
# Makefile for lib-src subdirectory in GNU Emacs.
# Copyright (C) 1985, 1987, 1988, 1993, 1994, 2001, 2002, 2003, 2004,
# 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
# 2005, 2006, 2007, 2008, 2009, 2010
# Free Software Foundation, Inc.
# This file is part of GNU Emacs.
......@@ -111,7 +112,7 @@ INSTALL_STRIP =
# Things that a user might actually run, which should be installed in bindir.
INSTALLABLES = etags${EXEEXT} ctags${EXEEXT} emacsclient${EXEEXT} \
b2m${EXEEXT} ebrowse${EXEEXT}
ebrowse${EXEEXT}
INSTALLABLE_SCRIPTS = rcs-checkin grep-changelog
STAMP_INST_SCRIPTS = stamp-rcs-checkin stamp-grep-changelog
......@@ -359,10 +360,6 @@ digest-doc${EXEEXT}: ${srcdir}/digest-doc.c
sorted-doc${EXEEXT}: ${srcdir}/sorted-doc.c
$(CC) ${ALL_CFLAGS} ${srcdir}/sorted-doc.c $(LOADLIBES) -o sorted-doc
b2m${EXEEXT}: ${srcdir}/b2m.c ../src/config.h $(GETOPTDEPS)
$(CC) ${ALL_CFLAGS} ${srcdir}/b2m.c -DVERSION="\"${version}\"" \
$(GETOPTOBJS) $(LOADLIBES) -o b2m
movemail${EXEEXT}: movemail.o pop.o $(GETOPTDEPS)
$(CC) ${LINK_CFLAGS} ${MOVE_FLAGS} movemail.o pop.o \
$(GETOPTOBJS) $(LOADLIBES) $(LIBS_MOVE) -o movemail
......
/*
* b2m - a filter for Babyl -> Unix mail files
* The copyright on this file has been disclaimed.
*
* usage: b2m < babyl > mailbox
*
* I find this useful whenever I have to use a
* system which - shock horror! - doesn't run
* GNU Emacs. At least now I can read all my
* GNU Emacs Babyl format mail files!
*
* it's not much but it's free!
*
* Ed Wilkinson
* E.Wilkinson@massey.ac.nz
* Mon Nov 7 15:54:06 PDT 1988
*/
/* Made conformant to the GNU coding standards January, 1995
by Francesco Potorti` <pot@cnuce.cnr.it>. */
#ifdef HAVE_CONFIG_H
#include <config.h>
/* On some systems, Emacs defines static as nothing for the sake
of unexec. We don't want that here since we don't use unexec. */
#undef static
#endif
#include <stdio.h>
#include <time.h>
#include <sys/types.h>
#include <getopt.h>
#ifdef MSDOS
#include <fcntl.h>
#endif
#undef TRUE
#define TRUE 1
#undef FALSE
#define FALSE 0
#define streq(s,t) (strcmp (s, t) == 0)
#define strneq(s,t,n) (strncmp (s, t, n) == 0)
typedef int logical;
#define TM_YEAR_BASE 1900
/* Nonzero if TM_YEAR is a struct tm's tm_year value that causes
asctime to have well-defined behavior. */
#ifndef TM_YEAR_IN_ASCTIME_RANGE
# define TM_YEAR_IN_ASCTIME_RANGE(tm_year) \
(1000 - TM_YEAR_BASE <= (tm_year) && (tm_year) <= 9999 - TM_YEAR_BASE)
#endif
/*
* A `struct linebuffer' is a structure which holds a line of text.
* `readline' reads a line from a stream into a linebuffer and works
* regardless of the length of the line.
*/
struct linebuffer
{
long size;
char *buffer;
};
extern char *strtok(char *, const char *);
long *xmalloc (unsigned int size);
long *xrealloc (char *ptr, unsigned int size);
char *concat (const char *s1, const char *s2, const char *s3);
long readline (struct linebuffer *linebuffer, register FILE *stream);
void fatal (const char *message) NO_RETURN;
/*
* xnew -- allocate storage. SYNOPSIS: Type *xnew (int n, Type);
*/
#define xnew(n, Type) ((Type *) xmalloc ((n) * sizeof (Type)))
char *progname;
struct option longopts[] =
{
{ "help", no_argument, NULL, 'h' },
{ "version", no_argument, NULL, 'V' },
{ 0 }
};
extern int optind;
int
main (int argc, char **argv)
{
logical labels_saved, printing, header, first, last_was_blank_line;
time_t ltoday;
struct tm *tm;
char *labels, *p, *today;
struct linebuffer data;
#ifdef MSDOS
_fmode = O_BINARY; /* all of files are treated as binary files */
#if __DJGPP__ > 1
if (!isatty (fileno (stdout)))
setmode (fileno (stdout), O_BINARY);
if (!isatty (fileno (stdin)))
setmode (fileno (stdin), O_BINARY);
#else /* not __DJGPP__ > 1 */
(stdout)->_flag &= ~_IOTEXT;
(stdin)->_flag &= ~_IOTEXT;
#endif /* not __DJGPP__ > 1 */
#endif
progname = argv[0];
while (1)
{
int opt = getopt_long (argc, argv, "hV", longopts, 0);
if (opt == EOF)
break;
switch (opt)
{
case 'V':
printf ("%s (GNU Emacs %s)\n", "b2m", VERSION);
puts ("b2m is in the public domain.");
exit (EXIT_SUCCESS);
case 'h':
fprintf (stderr, "Usage: %s <babylmailbox >unixmailbox\n", progname);
exit (EXIT_SUCCESS);
}
}
if (optind != argc)
{
fprintf (stderr, "Usage: %s <babylmailbox >unixmailbox\n", progname);
exit (EXIT_SUCCESS);
}
labels_saved = printing = header = last_was_blank_line = FALSE;
first = TRUE;
ltoday = time (0);
/* Convert to a string, checking for out-of-range time stamps.
Don't use 'ctime', as that might dump core if the hardware clock
is set to a bizarre value. */
tm = localtime (&ltoday);
if (! (tm && TM_YEAR_IN_ASCTIME_RANGE (tm->tm_year)
&& (today = asctime (tm))))
fatal ("current time is out of range");
data.size = 200;
data.buffer = xnew (200, char);
if (readline (&data, stdin) == 0
|| !strneq (data.buffer, "BABYL OPTIONS:", 14))
fatal ("standard input is not a Babyl mailfile.");
while (readline (&data, stdin) > 0)
{
if (streq (data.buffer, "*** EOOH ***") && !printing)
{
printing = header = TRUE;
printf ("From \"Babyl to mail by %s\" %s", progname, today);
continue;
}
if (data.buffer[0] == '\037')
{
if (data.buffer[1] == '\0')
continue;
else if (data.buffer[1] == '\f')
{
static char babyl[] = "X-Babyl-Labels: ";
if (first)
first = FALSE;
else if (! last_was_blank_line)
puts("");
/* Save labels. */
readline (&data, stdin);
p = strtok (data.buffer, " ,\r\n\t");
labels = babyl;
while ((p = strtok (NULL, " ,\r\n\t")))
labels = concat (labels, p, ", ");
p = &labels[strlen (labels) - 2];
if (*p == ',')
*p = '\0';
printing = header = FALSE;
labels_saved = TRUE;
continue;
}
}
if ((data.buffer[0] == '\0') && header)
{
header = FALSE;
if (labels_saved)
puts (labels);
}
if (printing)
{
puts (data.buffer);
if (data.buffer[0] == '\0')
last_was_blank_line = TRUE;
else
last_was_blank_line = FALSE;
}
}
return EXIT_SUCCESS;
}
/*
* Return a newly-allocated string whose contents
* concatenate those of s1, s2, s3.
*/
char *
concat (const char *s1, const char *s2, const char *s3)
{
int len1 = strlen (s1), len2 = strlen (s2), len3 = strlen (s3);
char *result = xnew (len1 + len2 + len3 + 1, char);
strcpy (result, s1);
strcpy (result + len1, s2);
strcpy (result + len1 + len2, s3);
result[len1 + len2 + len3] = '\0';
return result;
}
/*
* Read a line of text from `stream' into `linebuffer'.
* Return the number of characters read from `stream',
* which is the length of the line including the newline, if any.
*/
long
readline (struct linebuffer *linebuffer, register FILE *stream)
{
char *buffer = linebuffer->buffer;
register char *p = linebuffer->buffer;
register char *pend;
int chars_deleted;
pend = p + linebuffer->size; /* Separate to avoid 386/IX compiler bug. */
while (1)
{
register int c = getc (stream);
if (p == pend)
{
linebuffer->size *= 2;
buffer = (char *) xrealloc (buffer, linebuffer->size);
p += buffer - linebuffer->buffer;
pend = buffer + linebuffer->size;
linebuffer->buffer = buffer;
}
if (c == EOF)
{
*p = '\0';
chars_deleted = 0;
break;
}
if (c == '\n')
{
if (p > buffer && p[-1] == '\r')
{
*--p = '\0';
chars_deleted = 2;
}
else
{
*p = '\0';
chars_deleted = 1;
}
break;
}
*p++ = c;
}
return (p - buffer + chars_deleted);
}
/*
* Like malloc but get fatal error if memory is exhausted.
*/
long *
xmalloc (unsigned int size)
{
long *result = (long *) malloc (size);
if (result == NULL)
fatal ("virtual memory exhausted");
return result;
}
long *
xrealloc (char *ptr, unsigned int size)
{
long *result = (long *) realloc (ptr, size);
if (result == NULL)
fatal ("virtual memory exhausted");
return result;
}
void
fatal (const char *message)
{
fprintf (stderr, "%s: %s\n", progname, message);
exit (EXIT_FAILURE);
}
/* arch-tag: 5a3ad2af-a802-408f-83cc-e7cf5e98653e
(do not change this comment) */
/* b2m.c ends here */
#!/usr/bin/perl
# b2m.pl - Script to convert a Babyl file to an mbox file
# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
# Free Software Foundation, Inc.
# Maintainer: Jonathan Kamens <jik@kamens.brookline.ma.us>
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Requires CPAN modules: MailTools (for Mail::Address), TimeDate (for
# Date::Parse).
use warnings;
use strict;
use File::Basename;
use Getopt::Long;
use Mail::Address;
use Date::Parse;
my($whoami) = basename $0;
my($version) = '$Revision$';
my($usage) = "Usage: $whoami [--help] [--version] [--[no]full-headers] [Babyl-file]
\tBy default, full headers are printed.\n";
my($opt_help, $opt_version);
my($opt_full_headers) = 1;
die $usage if (! GetOptions(
'help' => \$opt_help,
'version' => \$opt_version,
'full-headers!' => \$opt_full_headers,
));
if ($opt_help) {
print $usage;
exit;
}
elsif ($opt_version) {
print "$whoami version: $version\n";
exit;
}
die $usage if (@ARGV > 1);
$/ = "\n\037";
if (<> !~ /^BABYL OPTIONS:/) {
die "$whoami: $ARGV is not a Babyl file\n$usage";
}
while (<>) {
my($msg_num) = $. - 1;
my($labels, $pruned, $full_header, $header);
my($from_line, $from_addr);
my($time);
# This will strip the initial form feed, any whitespace that may
# be following it, and then a newline
s/^\s+//;
# This will strip the ^_ off of the end of the message
s/\037$//;
if (! s/(.*)\n//) {
malformatted:
warn "$whoami: message $msg_num in $ARGV is malformatted\n";
next;
}
$labels = $1;
# Strip the integer indicating whether the header is pruned
$labels =~ s/^(\d+)[,\s]*//;
$pruned = $1;
s/(?:((?:.+\n)+)\n*)?\*\*\* EOOH \*\*\*\n+// || goto malformatted;
$full_header = $1;
if (s/((?:.+\n)+)\n+//) {
$header = $1;
}
else {
# Message has no body
$header = $_;
$_ = '';
}
# "$pruned eq '0'" is different from "! $pruned". We want to make
# sure that we found a valid label line which explicitly indicated
# that the header was not pruned.
if ((! $full_header) || ($pruned eq '0')) {
$full_header = $header;
}
# End message with two newlines (some mbox parsers require a blank
# line before the next "From " line).
s/\s+$/\n\n/;
# Quote "^From "
s/(^|\n)From /$1>From /g;
# Strip extra commas and whitespace from the end
$labels =~ s/[,\s]+$//;
# Now collapse extra commas and whitespace in the remaining label string
$labels =~ s/[,\s]+/, /g;
foreach my $rmail_header qw(summary-line x-coding-system) {
$full_header =~ s/(^|\n)$rmail_header:.*\n/$1/i;
}
if ($full_header =~ s/(^|\n)mail-from:\s*(From .*)\n/$1/i) {
($from_line = $2) =~ s/\s*$/\n/;
}
else {
foreach my $addr_header qw(return-path from really-from sender) {
if ($full_header =~ /(?:^|\n)$addr_header:\s*(.*\n(?:\B.*\n)*)/i) {
my($addr) = Mail::Address->parse($1);
$from_addr = $addr->address($addr);
last;
}
}
if (! $from_addr) {
$from_addr = "Babyl_to_mail_by_$whoami\@localhost";
}
if ($full_header =~ /(?:^|\n)date:\s*(\S.*\S)/i) {
$time = str2time($1);
}
if (! $time) {
# No Date header or we failed to parse it
$time = time;
}
$from_line = "From " . $from_addr . " " . localtime($time) . "\n";
}
print($from_line, ($opt_full_headers ? $full_header : $header),
($labels ? "X-Babyl-Labels: $labels\n" : ""), "\n",
$_) || die "$whoami: error writing to stdout: $!\n";
}
close(STDOUT) || die "$whoami: Error closing stdout: $!\n";
# arch-tag: 8c7c8ab0-721c-46d7-ba3e-139801240aa8
......@@ -395,12 +395,6 @@ $(BLD)/alloca.$(O) : \
$(EMACS_ROOT)/src/config.h \
$(EMACS_ROOT)/src/blockinput.h
$(BLD)/b2m.$(O) : \
$(SRC)/b2m.c \
$(EMACS_ROOT)/src/s/ms-w32.h \
$(EMACS_ROOT)/src/m/intel386.h \
$(EMACS_ROOT)/lib-src/../src/config.h
$(BLD)/ctags.$(O) : \
$(SRC)/ctags.c \
$(EMACS_ROOT)/nt/inc/sys/param.h \
......
2010-10-09 Glenn Morris <rgm@gnu.org>
* emacs-lisp/authors.el (authors-valid-file-names): Add b2m.c.
* net/browse-url.el: Don't require thingatpt, term, dired,
executable, or w3-auto when compiling.
(dired-get-filename, term-char-mode, term-send-down, term-send-string):
......
......@@ -507,6 +507,7 @@ Changes to files in this list are not listed.")
"ymakefile"
"permute-index" "index.perm"
"ibmrs6000.inp"
"b2m.c"
"emacs.ico"
"emacs21.ico"
"LPF" "LEDIT" "OTHER.EMACSES"
......@@ -1027,5 +1028,4 @@ the Emacs source tree, from which to build the file."
(provide 'authors)
;; arch-tag: 659d5900-5ff2-43b0-954c-a315cc1e4dc1
;;; authors.el ends here
......@@ -480,7 +480,7 @@ echo "Making links to \`lib-src'"
(cd lib-src
ln [a-zA-Z]*.[chmy] ../${tempdir}/lib-src
ln ChangeLog Makefile.in README testfile vcdiff ../${tempdir}/lib-src
ln b2m.pl grep-changelog rcs2log rcs-checkin ../${tempdir}/lib-src
ln grep-changelog rcs2log rcs-checkin ../${tempdir}/lib-src
ln makefile.w32-in ../${tempdir}/lib-src
## If we ended up with a symlink, or if we did not get anything
## due to a cross-device symlink, copy the file.
......@@ -769,5 +769,4 @@ else