mirror of
git://git.sv.gnu.org/coreutils.git
synced 2026-07-30 12:29:31 +02:00
merge with 1.10q
This commit is contained in:
+4
-2
@@ -962,11 +962,13 @@ main (ac, av)
|
||||
int ac;
|
||||
char *av[];
|
||||
{
|
||||
char buff[128];
|
||||
time_t d;
|
||||
char buff[MAX_BUFF_LEN + 1];
|
||||
time_t d;
|
||||
|
||||
(void)printf ("Enter date, or blank line to exit.\n\t> ");
|
||||
(void)fflush (stdout);
|
||||
|
||||
buff[MAX_BUFF_LEN] = 0;
|
||||
while (fgets (buff, MAX_BUFF_LEN, stdin) && buff[0]) {
|
||||
d = get_date (buff, (struct timeb *)NULL);
|
||||
if (d == -1)
|
||||
|
||||
@@ -1,5 +1,49 @@
|
||||
Fri Oct 07 19:42:35 1994 Jim Meyering (meyering@comco.com)
|
||||
|
||||
* doc/Makefile.in (sh-utils.dvi): Depend on version.texi.
|
||||
* version.texi: Use RELEASEDATE, not RELEASE_DATE.
|
||||
* sh-utils.texi: Likewise.
|
||||
|
||||
* configure.in: Test for crypt in -lcrypt for NetBSD.
|
||||
Reported by Greg Hudson (ghudson@mit.edu).
|
||||
|
||||
Thu Oct 06 21:14:07 1994 Jim Meyering (meyering@comco.com)
|
||||
|
||||
* src/Makefile.in (link_command): Remove $(CFLAGS). Becuase
|
||||
the default value usually includes -g, Linux users were getting
|
||||
statically linked executables. With this removal they'll get
|
||||
much smaller, dynamically linked ones by default.
|
||||
|
||||
* lib/Makefile.in (safe-lstat.o): Depend on safe-stat.h, too.
|
||||
|
||||
Sun Oct 02 16:15:32 1994 Jim Meyering (meyering@comco.com)
|
||||
|
||||
* src/Makefile.in: Don't use binprefix. Use autoconf-2's
|
||||
@program_transform_name@ instead.
|
||||
* man/Makefile.in: Likewise for manprefix.
|
||||
|
||||
* safe-xstat.hin [!S_ISLNK]: Include safe-stat.h and define
|
||||
SAFE_LSTAT and safe_lstat to their symlink-ignorant counterparts.
|
||||
* lib/Makefile.in (extract_lstat, extract_stat): Add sed rules to
|
||||
extract the new cpp directives into safe-lstat.h, but not into
|
||||
safe-stat.h.
|
||||
|
||||
Sat Oct 01 00:14:10 1994 Jim Meyering (meyering@comco.com)
|
||||
|
||||
* system.h: Remove conditional definition of mode_t.
|
||||
configure takes care of this now.
|
||||
|
||||
* configure.in: Add -l$lib (not $lib) to LIBS when checking
|
||||
for syslog. From Kaveh Ghazi.
|
||||
|
||||
* date.c (batch_convert): Use K&R style function definition.
|
||||
From Kaveh Ghazi.
|
||||
|
||||
* date.c (main): When reading dates from a file with a +FORMAT-style
|
||||
user-specified format, don't print the leading `+'. Franc,ois Pinard
|
||||
noticed this problem.
|
||||
Make an error message clearer. From Franc,ois.
|
||||
|
||||
* lib/Makefile.in (DISTFILES): Add getline.h.
|
||||
(SOURCES, OBJECTS): Add getline.c, getline.o.
|
||||
|
||||
|
||||
+17
@@ -126,6 +126,15 @@
|
||||
#if defined(VFLUSH) && !defined(VFLUSHO) /* Ultrix 4.2 */
|
||||
#define VFLUSHO VFLUSH
|
||||
#endif
|
||||
#if defined(CTLECH) && !defined(ECHOCTL) /* Ultrix 4.3 */
|
||||
#define ECHOCTL CTLECH
|
||||
#endif
|
||||
#if defined(TCTLECH) && !defined(ECHOCTL) /* Ultrix 4.2 */
|
||||
#define ECHOCTL TCTLECH
|
||||
#endif
|
||||
#if defined(CRTKIL) && !defined(ECHOKE) /* Ultrix 4.2 and 4.3 */
|
||||
#define ECHOKE CRTKIL
|
||||
#endif
|
||||
#if defined(VFLUSHO) && !defined(CFLUSHO)
|
||||
#define CFLUSHO Control ('o')
|
||||
#endif
|
||||
@@ -905,8 +914,16 @@ main (argc, argv)
|
||||
new_mode.c_cflag &= (~CIBAUD);
|
||||
if (speed_was_set || memcmp (&mode, &new_mode, sizeof (mode)) != 0)
|
||||
#endif
|
||||
{
|
||||
int i;
|
||||
error (1, 0,
|
||||
"standard input: unable to perform all requested operations");
|
||||
printf ("new_mode: mode\n");
|
||||
for (i=0; i<sizeof(new_mode); i++)
|
||||
printf ("0x%02x: 0x%02x\n",
|
||||
*(((unsigned char *) &new_mode) + i),
|
||||
*(((unsigned char *) &mode) + i));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user