From 6c3dfa5f3c1487ef1051d41402a06b90449cbf49 Mon Sep 17 00:00:00 2001 From: Ben Gras Date: Fri, 6 Sep 2013 12:07:47 +0200 Subject: [PATCH] switch to netbsd not entirely clean; _SIGN hack remains for now. also leave in minix-specific stuff like minix-specific errno's and OK. Change-Id: I035efc52e27b92f58ae0d88dab19dec263edb6e3 --- distrib/sets/lists/minix/mi | 2 +- drivers/tty/tty.c | 1 + sys/sys/errno.h | 354 ++++++++++++++++++++---------------- usr.bin/Makefile | 7 +- 4 files changed, 203 insertions(+), 161 deletions(-) diff --git a/distrib/sets/lists/minix/mi b/distrib/sets/lists/minix/mi index d924283b0..8d83425a2 100644 --- a/distrib/sets/lists/minix/mi +++ b/distrib/sets/lists/minix/mi @@ -1222,7 +1222,7 @@ ./usr/include/minix/sysinfo.h minix-sys ./usr/include/minix/syslib.h minix-sys ./usr/include/minix/sysutil.h minix-sys -./usr/include/minix/termios.h minix-sys +./usr/include/minix/termios.h minix-sys obsolete ./usr/include/minix/timers.h minix-sys ./usr/include/minix/tty.h minix-sys obsolete ./usr/include/minix/type.h minix-sys diff --git a/drivers/tty/tty.c b/drivers/tty/tty.c index f73becfc5..41e3fbdbc 100644 --- a/drivers/tty/tty.c +++ b/drivers/tty/tty.c @@ -715,6 +715,7 @@ static int do_ioctl(devminor_t minor, unsigned long request, endpoint_t endpt, break; case TIOCSCTTY: + /* Process sets this tty as its controlling tty */ tp->tty_pgrp = user_endpt; break; diff --git a/sys/sys/errno.h b/sys/sys/errno.h index c29599388..e7ffca759 100644 --- a/sys/sys/errno.h +++ b/sys/sys/errno.h @@ -1,25 +1,189 @@ -/* The header defines the numbers of the various errors that can - * occur during program execution. They are visible to user programs and - * should be small positive integers. However, they are also used within - * MINIX, where they must be negative. For example, the READ system call is - * executed internally by calling do_read(). This function returns either a - * (negative) error number or a (positive) number of bytes actually read. +/* $NetBSD: errno.h,v 1.39 2006/10/31 00:38:07 cbiere Exp $ */ + +/* + * Copyright (c) 1982, 1986, 1989, 1993 + * The Regents of the University of California. All rights reserved. + * (c) UNIX System Laboratories, Inc. + * All or some portions of this file are derived from material licensed + * to the University of California by American Telephone and Telegraph + * Co. or Unix System Laboratories, Inc. and are reproduced herein with + * the permission of UNIX System Laboratories, Inc. * - * To solve the problem of having the error numbers be negative inside the - * the system and positive outside, the following mechanism is used. All the - * definitions are are the form: + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. * - * EPERM (_SIGN 1 ) + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. * - * If the macro _SYSTEM is defined, then _SIGN is set to "-", otherwise it is - * set to "". Thus when compiling the operating system, the macro _SYSTEM - * will be defined, setting EPERM to (- 1), whereas when when this - * file is included in an ordinary user program, EPERM has the value ( 1). + * @(#)errno.h 8.5 (Berkeley) 1/21/94 */ #ifndef _SYS_ERRNO_H_ #define _SYS_ERRNO_H_ +#define EPERM (_SIGN 1 ) /* Operation not permitted */ +#define ENOENT (_SIGN 2 ) /* No such file or directory */ +#define ESRCH (_SIGN 3 ) /* No such process */ +#define EINTR (_SIGN 4 ) /* Interrupted system call */ +#define EIO (_SIGN 5 ) /* Input/output error */ +#define ENXIO (_SIGN 6 ) /* Device not configured */ +#define E2BIG (_SIGN 7 ) /* Argument list too long */ +#define ENOEXEC (_SIGN 8 ) /* Exec format error */ +#define EBADF (_SIGN 9 ) /* Bad file descriptor */ +#define ECHILD (_SIGN 10 ) /* No child processes */ +#define EDEADLK (_SIGN 11 ) /* Resource deadlock avoided */ + /* 11 was EAGAIN */ +#define ENOMEM (_SIGN 12 ) /* Cannot allocate memory */ +#define EACCES (_SIGN 13 ) /* Permission denied */ +#define EFAULT (_SIGN 14 ) /* Bad address */ +#define ENOTBLK (_SIGN 15 ) /* Block device required */ +#define EBUSY (_SIGN 16 ) /* Device busy */ +#define EEXIST (_SIGN 17 ) /* File exists */ +#define EXDEV (_SIGN 18 ) /* Cross-device link */ +#define ENODEV (_SIGN 19 ) /* Operation not supported by device */ +#define ENOTDIR (_SIGN 20 ) /* Not a directory */ +#define EISDIR (_SIGN 21 ) /* Is a directory */ +#define EINVAL (_SIGN 22 ) /* Invalid argument */ +#define ENFILE (_SIGN 23 ) /* Too many open files in system */ +#define EMFILE (_SIGN 24 ) /* Too many open files */ +#define ENOTTY (_SIGN 25 ) /* Inappropriate ioctl for device */ +#define ETXTBSY (_SIGN 26 ) /* Text file busy */ +#define EFBIG (_SIGN 27 ) /* File too large */ +#define ENOSPC (_SIGN 28 ) /* No space left on device */ +#define ESPIPE (_SIGN 29 ) /* Illegal seek */ +#define EROFS (_SIGN 30 ) /* Read-only file system */ +#define EMLINK (_SIGN 31 ) /* Too many links */ +#define EPIPE (_SIGN 32 ) /* Broken pipe */ + +/* math software */ +#define EDOM (_SIGN 33 ) /* Numerical argument out of domain */ +#define ERANGE (_SIGN 34 ) /* Result too large or too small */ + +/* non-blocking and interrupt i/o */ +#define EAGAIN (_SIGN 35 ) /* Resource temporarily unavailable */ +#define EWOULDBLOCK EAGAIN /* Operation would block */ +#define EINPROGRESS (_SIGN 36 ) /* Operation now in progress */ +#define EALREADY (_SIGN 37 ) /* Operation already in progress */ + +/* ipc/network software -- argument errors */ +#define ENOTSOCK (_SIGN 38 ) /* Socket operation on non-socket */ +#define EDESTADDRREQ (_SIGN 39 ) /* Destination address required */ +#define EMSGSIZE (_SIGN 40 ) /* Message too long */ +#define EPROTOTYPE (_SIGN 41 ) /* Protocol wrong type for socket */ +#define ENOPROTOOPT (_SIGN 42 ) /* Protocol option not available */ +#define EPROTONOSUPPORT (_SIGN 43 ) /* Protocol not supported */ +#define ESOCKTNOSUPPORT (_SIGN 44 ) /* Socket type not supported */ +#define EOPNOTSUPP (_SIGN 45 ) /* Operation not supported */ +#define EPFNOSUPPORT (_SIGN 46 ) /* Protocol family not supported */ +#define EAFNOSUPPORT (_SIGN 47 ) /* Address family not supported by protocol family */ +#define EADDRINUSE (_SIGN 48 ) /* Address already in use */ +#define EADDRNOTAVAIL (_SIGN 49 ) /* Can't assign requested address */ + +/* ipc/network software -- operational errors */ +#define ENETDOWN (_SIGN 50 ) /* Network is down */ +#define ENETUNREACH (_SIGN 51 ) /* Network is unreachable */ +#define ENETRESET (_SIGN 52 ) /* Network dropped connection on reset */ +#define ECONNABORTED (_SIGN 53 ) /* Software caused connection abort */ +#define ECONNRESET (_SIGN 54 ) /* Connection reset by peer */ +#define ENOBUFS (_SIGN 55 ) /* No buffer space available */ +#define EISCONN (_SIGN 56 ) /* Socket is already connected */ +#define ENOTCONN (_SIGN 57 ) /* Socket is not connected */ +#define ESHUTDOWN (_SIGN 58 ) /* Can't send after socket shutdown */ +#define ETOOMANYREFS (_SIGN 59 ) /* Too many references: can't splice */ +#define ETIMEDOUT (_SIGN 60 ) /* Operation timed out */ +#define ECONNREFUSED (_SIGN 61 ) /* Connection refused */ + +#define ELOOP (_SIGN 62 ) /* Too many levels of symbolic links */ +#define ENAMETOOLONG (_SIGN 63 ) /* File name too long */ + +/* should be rearranged */ +#define EHOSTDOWN (_SIGN 64 ) /* Host is down */ +#define EHOSTUNREACH (_SIGN 65 ) /* No route to host */ +#define ENOTEMPTY (_SIGN 66 ) /* Directory not empty */ + +/* quotas & mush */ +#define EPROCLIM (_SIGN 67 ) /* Too many processes */ +#define EUSERS (_SIGN 68 ) /* Too many users */ +#define EDQUOT (_SIGN 69 ) /* Disc quota exceeded */ + +/* Network File System */ +#define ESTALE (_SIGN 70 ) /* Stale NFS file handle */ +#define EREMOTE (_SIGN 71 ) /* Too many levels of remote in path */ +#define EBADRPC (_SIGN 72 ) /* RPC struct is bad */ +#define ERPCMISMATCH (_SIGN 73 ) /* RPC version wrong */ +#define EPROGUNAVAIL (_SIGN 74 ) /* RPC prog. not avail */ +#define EPROGMISMATCH (_SIGN 75 ) /* Program version wrong */ +#define EPROCUNAVAIL (_SIGN 76 ) /* Bad procedure for program */ + +#define ENOLCK (_SIGN 77 ) /* No locks available */ +#define ENOSYS (_SIGN 78 ) /* Function not implemented */ + +#define EFTYPE (_SIGN 79 ) /* Inappropriate file type or format */ +#define EAUTH (_SIGN 80 ) /* Authentication error */ +#define ENEEDAUTH (_SIGN 81 ) /* Need authenticator */ + +/* SystemV IPC */ +#define EIDRM (_SIGN 82 ) /* Identifier removed */ +#define ENOMSG (_SIGN 83 ) /* No message of desired type */ +#define EOVERFLOW (_SIGN 84 ) /* Value too large to be stored in data type */ + +/* Wide/multibyte-character handling, ISO/IEC 9899/AMD1:1995 */ +#define EILSEQ (_SIGN 85 ) /* Illegal byte sequence */ + +/* From IEEE Std 1003.1-2001 */ +/* Base, Realtime, Threads or Thread Priority Scheduling option errors */ +#define ENOTSUP (_SIGN 86 ) /* Not supported */ + +/* Realtime option errors */ +#define ECANCELED (_SIGN 87 ) /* Operation canceled */ + +/* Realtime, XSI STREAMS option errors */ +#define EBADMSG (_SIGN 88 ) /* Bad or Corrupt message */ + +/* XSI STREAMS option errors */ +#define ENODATA (_SIGN 89 ) /* No message available */ +#define ENOSR (_SIGN 90 ) /* No STREAM resources */ +#define ENOSTR (_SIGN 91 ) /* Not a STREAM */ +#define ETIME (_SIGN 92 ) /* STREAM ioctl timeout */ + +/* File system extended attribute errors */ +#define ENOATTR (_SIGN 93 ) /* Attribute not found */ + +/* Realtime, XSI STREAMS option errors */ +#define EMULTIHOP (_SIGN 94 ) /* Multihop attempted */ +#define ENOLINK (_SIGN 95 ) /* Link has been severed */ +#define EPROTO (_SIGN 96 ) /* Protocol error */ + +#define ELAST (_SIGN 96 ) /* Must equal largest errno */ + +#ifdef _KERNEL +/* pseudo-errors returned inside kernel to modify return to process */ +#define EJUSTRETURN -2 /* don't modify regs, just return */ +#define ERESTART -3 /* restart syscall */ +#define EPASSTHROUGH -4 /* ioctl not handled by this layer */ +#define EDUPFD -5 /* Dup given fd */ +#define EMOVEFD -6 /* Move given fd */ +#endif + +#ifdef __minix /* Now define _SIGN as "" or "-" depending on _SYSTEM. */ #ifdef _SYSTEM # define _SIGN - @@ -28,148 +192,26 @@ # define _SIGN #endif +/* minix-specific error codes */ +#define ERESTART (_SIGN 200 ) /* service restarted */ +#define ENOTREADY (_SIGN 201 ) /* source or destination is not ready */ +#define EDEADSRCDST (_SIGN 202 ) /* source or destination is not alive */ +#define EDONTREPLY (_SIGN 203 ) /* pseudo-code: don't send a reply */ +#define EGENERIC (_SIGN 204 ) /* generic error */ +#define EPACKSIZE (_SIGN 205 ) /* invalid packet size for some protocol */ +#define EURG (_SIGN 206 ) /* urgent data present */ +#define ENOURG (_SIGN 207 ) /* no urgent data present */ +#define ELOCKED (_SIGN 208 ) /* can't send message due to deadlock */ +#define EBADCALL (_SIGN 209 ) /* illegal system call number */ +#define ECALLDENIED (_SIGN 210 ) /* no permission for system call */ +#define ETRAPDENIED (_SIGN 211 ) /* IPC trap not allowed */ +#define EBADREQUEST (_SIGN 212 ) /* destination cannot handle request */ +#define EBADMODE (_SIGN 213 ) /* badmode in ioctl */ +#define ENOCONN (_SIGN 214 ) /* no such connection */ +#define EDEADEPT (_SIGN 215 ) /* specified endpoint is not alive */ +#define EBADEPT (_SIGN 216 ) /* specified endpoint is bad */ +#define EBADCPU (_SIGN 217 ) /* requested CPU does not work */ - -#define EPERM (_SIGN 1 ) /* operation not permitted */ -#define ENOENT (_SIGN 2 ) /* no such file or directory */ -#define ESRCH (_SIGN 3 ) /* no such process */ -#define EINTR (_SIGN 4 ) /* interrupted function call */ -#define EIO (_SIGN 5 ) /* input/output error */ -#define ENXIO (_SIGN 6 ) /* no such device or address */ -#define E2BIG (_SIGN 7 ) /* arg list too long */ -#define ENOEXEC (_SIGN 8 ) /* exec format error */ -#define EBADF (_SIGN 9 ) /* bad file descriptor */ -#define ECHILD (_SIGN 10 ) /* no child process */ -#define EAGAIN (_SIGN 11 ) /* resource temporarily unavailable */ -#define ENOMEM (_SIGN 12 ) /* not enough space */ -#define EACCES (_SIGN 13 ) /* permission denied */ -#define EFAULT (_SIGN 14 ) /* bad address */ -#define ENOTBLK (_SIGN 15 ) /* Extension: not a block special file */ -#define EBUSY (_SIGN 16 ) /* resource busy */ -#define EEXIST (_SIGN 17 ) /* file exists */ -#define EXDEV (_SIGN 18 ) /* improper link */ -#define ENODEV (_SIGN 19 ) /* no such device */ -#define ENOTDIR (_SIGN 20 ) /* not a directory */ -#define EISDIR (_SIGN 21 ) /* is a directory */ -#define EINVAL (_SIGN 22 ) /* invalid argument */ -#define ENFILE (_SIGN 23 ) /* too many open files in system */ -#define EMFILE (_SIGN 24 ) /* too many open files */ -#define ENOTTY (_SIGN 25 ) /* inappropriate I/O control operation */ -#define ETXTBSY (_SIGN 26 ) /* no longer used */ -#define EFBIG (_SIGN 27 ) /* file too large */ -#define ENOSPC (_SIGN 28 ) /* no space left on device */ -#define ESPIPE (_SIGN 29 ) /* invalid seek */ -#define EROFS (_SIGN 30 ) /* read-only file system */ -#define EMLINK (_SIGN 31 ) /* too many links */ -#define EPIPE (_SIGN 32 ) /* broken pipe */ -#define EDOM (_SIGN 33 ) /* domain error (from ANSI C std ) */ -#define ERANGE (_SIGN 34 ) /* result too large (from ANSI C std ) */ -#define EDEADLK (_SIGN 35 ) /* resource deadlock avoided */ -#define ENAMETOOLONG (_SIGN 36 ) /* file name too long */ -#define ENOLCK (_SIGN 37 ) /* no locks available */ -#define ENOSYS (_SIGN 38 ) /* function not implemented */ -#define ENOTEMPTY (_SIGN 39 ) /* directory not empty */ -#define ELOOP (_SIGN 40 ) /* too many levels of symlinks detected */ -#define ERESTART (_SIGN 41 ) /* service restarted */ -#define EIDRM (_SIGN 43 ) /* Identifier removed */ -#define EILSEQ (_SIGN 44 ) /* illegal byte sequence */ -#define ENOMSG (_SIGN 45 ) /* No message of desired type */ -#define EOVERFLOW (_SIGN 46 ) /* Value too large to be stored in data type */ - -/* The following errors relate to networking. */ -#define EPACKSIZE (_SIGN 50 ) /* invalid packet size for some protocol */ -#define ENOBUFS (_SIGN 51 ) /* not enough buffers left */ -#define EBADMODE (_SIGN 53 ) /* badmode in ioctl */ -#define EWOULDBLOCK (_SIGN 54 ) /* call would block on nonblocking socket */ -#define ENETUNREACH (_SIGN 55 ) /* network unreachable */ -#define EHOSTUNREACH (_SIGN 56 ) /* host unreachable */ -#define EISCONN (_SIGN 57 ) /* already connected */ -#define EADDRINUSE (_SIGN 58 ) /* address in use */ -#define ECONNREFUSED (_SIGN 59 ) /* connection refused */ -#define ECONNRESET (_SIGN 60 ) /* connection reset */ -#define ETIMEDOUT (_SIGN 61 ) /* connection timed out */ -#define EURG (_SIGN 62 ) /* urgent data present */ -#define ENOURG (_SIGN 63 ) /* no urgent data present */ -#define ENOTCONN (_SIGN 64 ) /* no connection (yet or anymore ) */ -#define ESHUTDOWN (_SIGN 65 ) /* a write call to a shutdown connection */ -#define ENOCONN (_SIGN 66 ) /* no such connection */ -#define EAFNOSUPPORT (_SIGN 67 ) /* address family not supported */ -#define EPROTONOSUPPORT (_SIGN 68 ) /* protocol not supported by AF */ -#define EPROTOTYPE (_SIGN 69 ) /* Protocol wrong type for socket */ -#define EINPROGRESS (_SIGN 70 ) /* Operation now in progress */ -#define EADDRNOTAVAIL (_SIGN 71 ) /* Can't assign requested address */ -#define EALREADY (_SIGN 72 ) /* Connection already in progress */ -#define EMSGSIZE (_SIGN 73 ) /* Message too long */ -#define ENOTSOCK (_SIGN 74 ) /* Socket operation on non-socket */ -#define ENOPROTOOPT (_SIGN 75 ) /* Protocol not available */ -#define EOPNOTSUPP (_SIGN 76 ) /* Operation not supported */ -#define ENOTSUP ( EOPNOTSUPP ) /* Not supported */ -#define ENETDOWN (_SIGN 77 ) /* network is down */ -#define EPFNOSUPPORT (_SIGN 78 ) /* Protocol family not supported */ -#define EDESTADDRREQ (_SIGN 79 ) /* Destination address required */ -#define EHOSTDOWN (_SIGN 80 ) /* Host is down */ -#define ENETRESET (_SIGN 81 ) /* Network dropped connection on reset */ -#define ESOCKTNOSUPPORT (_SIGN 82 ) /* Socket type not supported */ -#define ECONNABORTED (_SIGN 83 ) /* Software caused connection abort */ -#define ETOOMANYREFS (_SIGN 84 ) /* Too many references: can't splice */ - -#define EGENERIC (_SIGN 99 ) /* generic error */ - -/* The following are not POSIX errors, but they can still happen. - * All of these are generated by the kernel and relate to message passing. - */ -#define ELOCKED (_SIGN 101 ) /* can't send message due to deadlock */ -#define EBADCALL (_SIGN 102 ) /* illegal system call number */ -#define EBADSRCDST (_SIGN 103 ) /* bad source or destination process */ -#define ECALLDENIED (_SIGN 104 ) /* no permission for system call */ -#define EDEADSRCDST (_SIGN 105 ) /* source or destination is not alive */ -#define ENOTREADY (_SIGN 106 ) /* source or destination is not ready */ -#define EBADREQUEST (_SIGN 107 ) /* destination cannot handle request */ -#define ETRAPDENIED (_SIGN 110 ) /* IPC trap not allowed */ - -/* The following errors are NetBSD errors. */ -#define EFTYPE (_SIGN 150 ) /* Inappropriate file type or format */ -#define EAUTH (_SIGN 151 ) /* Authentication error */ -#define ENEEDAUTH (_SIGN 152 ) /* Need authenticator */ -/* Realtime option errors */ -#define ECANCELED (_SIGN 153 ) /* Operation canceled */ - -/* Network File System */ -#define ESTALE (_SIGN 160 ) /* Stale NFS file handle */ -#define EREMOTE (_SIGN 161 ) /* Too many levels of remote in path */ -#define EBADRPC (_SIGN 162 ) /* RPC struct is bad */ -#define ERPCMISMATCH (_SIGN 163 ) /* RPC version wrong */ -#define EPROGUNAVAIL (_SIGN 164 ) /* RPC prog. not avail */ -#define EPROGMISMATCH (_SIGN 165 ) /* Program version wrong */ -#define EPROCUNAVAIL (_SIGN 166 ) /* Bad procedure for program */ - -/* Realtime, XSI STREAMS option errors */ -#define EBADMSG (_SIGN 170 ) /* Bad or Corrupt message */ - -/* quotas & mush */ -#define EPROCLIM (_SIGN 175 ) /* Too many processes */ -#define EUSERS (_SIGN 176 ) /* Too many users */ -#define EDQUOT (_SIGN 177 ) /* Disc quota exceeded */ - -/* Realtime, XSI STREAMS option errors */ -#define EMULTIHOP (_SIGN 180 ) /* Multihop attempted */ -#define ENOLINK (_SIGN 181 ) /* Link has been severed */ -#define EPROTO (_SIGN 182 ) /* Protocol error */ - -/* File system extended attribute errors */ -#define ENOATTR (_SIGN 185 ) /* Attribute not found */ - -/* XSI STREAMS option errors */ -#define ENODATA (_SIGN 190 ) /* No message available */ -#define ENOSR (_SIGN 191 ) /* No STREAM resources */ -#define ENOSTR (_SIGN 192 ) /* Not a STREAM */ -#define ETIME (_SIGN 193 ) /* STREAM ioctl timeout */ - -#define EDONTREPLY (_SIGN 201 ) /* pseudo-code: don't send a reply */ - -/* The following are non-POSIX server responses */ -#define EBADEPT (_SIGN 301 ) /* specified endpoint is bad */ -#define EDEADEPT (_SIGN 302 ) /* specified endpoint is not alive */ -#define EBADCPU (_SIGN 303 ) /* requested CPU does not work */ +#endif #endif /* !_SYS_ERRNO_H_ */ diff --git a/usr.bin/Makefile b/usr.bin/Makefile index 423f170c6..140050ed8 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -31,10 +31,9 @@ SUBDIR= asa \ toproto \ uniq units unvis unzip users \ uuidgen vis \ - uniq uname units unzip users \ - wall wc what whatis who whois \ - \ - write xargs xinstall xstr yes + wall write \ + xargs xinstall xstr yes \ + wc what whatis who whois .if !defined(__MINIX) SUBDIR+= ../external/zlib/pigz/bin/pigz