diff options
| author | Garrett D'Amore <Garrett.Damore@Sun.COM> | 2009-10-09 17:01:12 -0700 |
|---|---|---|
| committer | Garrett D'Amore <Garrett.Damore@Sun.COM> | 2009-10-09 17:01:12 -0700 |
| commit | 5bbb4db2c3f208d12bf0fd11769728f9e5ba66a2 (patch) | |
| tree | ff1164c9871a611c7597916b0395e944697a5431 /usr/src/ucblib | |
| parent | 28863dd2d94fb78bea3941334d3783f014da7403 (diff) | |
| download | illumos-gate-5bbb4db2c3f208d12bf0fd11769728f9e5ba66a2.tar.gz | |
PSARC 2009/539 Removal of ucb headers and lint libraries
6889898 ucb lint libraries and headers should go go go
Diffstat (limited to 'usr/src/ucblib')
36 files changed, 70 insertions, 1261 deletions
diff --git a/usr/src/ucblib/libcurses/Makefile.com b/usr/src/ucblib/libcurses/Makefile.com index 60cff941a1..0db5f7836c 100644 --- a/usr/src/ucblib/libcurses/Makefile.com +++ b/usr/src/ucblib/libcurses/Makefile.com @@ -19,11 +19,9 @@ # CDDL HEADER END # # -# Copyright 2007 Sun Microsystems, Inc. All rights reserved. +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# LIBRARY= libcurses.a VERS= .1 @@ -76,21 +74,7 @@ include $(SRC)/lib/Makefile.lib ROOTLIBDIR= $(ROOT)/usr/ucblib ROOTLIBDIR64= $(ROOT)/usr/ucblib/$(MACH64) -LIBS = $(DYNLIB) $(LINTLIB) - -LINTSRC= $(LINTLIB:%.ln=%) -ROOTLINTDIR= $(ROOTLIBDIR) -ROOTLINTDIR64= $(ROOTLIBDIR)/$(MACH64) -ROOTLINT= $(LINTSRC:%=$(ROOTLINTDIR)/%) -ROOTLINT64= $(LINTSRC:%=$(ROOTLINTDIR64)/%) - -# install rule for lint source file target -$(ROOTLINTDIR)/%: ../% - $(INS.file) -$(ROOTLINTDIR64)/%: ../% - $(INS.file) - -$(LINTLIB):= SRCS=../llib-lcurses +LIBS = $(DYNLIB) CFLAGS += $(CCVERBOSE) CFLAGS64 += $(CCVERBOSE) @@ -99,7 +83,7 @@ DYNFLAGS32 = -R/usr/ucblib DYNFLAGS64 = -R/usr/ucblib/$(MACH64) LDLIBS += -ltermcap -lucb -lc -CPPFLAGS = -I$(ROOT)/usr/ucbinclude -I../../../lib/libc/inc $(CPPFLAGS.master) +CPPFLAGS = -I$(SRC)/ucbhead -I../../../lib/libc/inc $(CPPFLAGS.master) .KEEP_STATE: diff --git a/usr/src/ucblib/libcurses/amd64/Makefile b/usr/src/ucblib/libcurses/amd64/Makefile index 121bc4c173..e538678e29 100644 --- a/usr/src/ucblib/libcurses/amd64/Makefile +++ b/usr/src/ucblib/libcurses/amd64/Makefile @@ -19,11 +19,9 @@ # CDDL HEADER END # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com include ../../../lib/Makefile.lib.64 @@ -34,4 +32,4 @@ BUILD.SO= $(CC) $(CFLAGS) -o $@ -G $(DYNFLAGS) $(PICS) \ .KEEP_STATE: -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/ucblib/libcurses/i386/Makefile b/usr/src/ucblib/libcurses/i386/Makefile index 7ec09c4a9c..75f501557f 100644 --- a/usr/src/ucblib/libcurses/i386/Makefile +++ b/usr/src/ucblib/libcurses/i386/Makefile @@ -19,11 +19,9 @@ # CDDL HEADER END # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com @@ -32,4 +30,4 @@ BUILD.SO= $(CC) -o $@ $(GSHARED) $(DYNFLAGS) $(PICS) -L $(ROOT)/usr/ucblib $(LDL .KEEP_STATE: -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/ucblib/libcurses/llib-lcurses b/usr/src/ucblib/libcurses/llib-lcurses deleted file mode 100644 index a21ce02071..0000000000 --- a/usr/src/ucblib/libcurses/llib-lcurses +++ /dev/null @@ -1,148 +0,0 @@ -/* - * Copyright 1990 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ -#pragma ident "%Z%%M% %I% %E% SMI" - -/* LINTLIBRARY */ - -# include <curses.h> -# include <signal.h> -# include <varargs.h> -# include <ctype.h> - -/* addch.c */ -int waddch(win, c) register struct _win_st *win; char c; { static int x; return(x); } - -/* addstr.c */ -int waddstr(win, str) register struct _win_st *win; register char *str; { static int x; return(x); } - -/* box.c */ -int box(win, vert, hor) register struct _win_st *win; char vert; char hor; { static int x; return(x); } - -/* clear.c */ -int wclear(win) register struct _win_st *win; { static int x; return(x); } - -/* clrtobot.c */ -int wclrtobot(win) register struct _win_st *win; { static int x; return(x); } - -/* clrtoeol.c */ -int wclrtoeol(win) register struct _win_st *win; { static int x; return(x); } - -/* cr_put.c */ -int mvcur(ly, lx, y, x) int ly; int lx; int y; int x; { static int z; return(z); } -int fgoto() { static int x; return(x); } -int plodput(c) int c; { static int x; return(x); } -int plod(cnt) int cnt; { static int x; return(x); } -int tabcol(col, ts) int col; int ts; { static int x; return(x); } - -/* cr_tty.c */ -int gettmode() { static int x; return(x); } -int setterm(type) register char *type; { static int x; return(x); } -int zap() { static int x; return(x); } -char *getcap(name) char *name; { static char *x; return(x); } - -/* curses.c */ - -/* delch.c */ -int wdelch(win) register struct _win_st *win; { static int x; return(x); } - -/* deleteln.c */ -int wdeleteln(win) register struct _win_st *win; { static int x; return(x); } - -/* delwin.c */ -int delwin(win) register struct _win_st *win; { static int x; return(x); } - -/* endwin.c */ -int endwin() { static int x; return(x); } - -/* erase.c */ -int werase(win) register struct _win_st *win; { static int x; return(x); } - -/* fullname.c */ -char *fullname(bp, def) register char *bp; register char *def; { static char *x; return(x); } - -/* getch.c */ -int wgetch(win) register struct _win_st *win; { static int x; return(x); } - -/* getstr.c */ -int wgetstr(win, str) register struct _win_st *win; register char *str; { static int x; return(x); } - -/* id_subwins.c */ -int _id_subwins(orig) register struct _win_st *orig; { static int x; return(x); } - -/* idlok.c */ -int idlok(win, bf) register struct _win_st *win; char bf; { static int x; return(x); } - -/* initscr.c */ -struct _win_st *initscr() { static struct _win_st *x; return(x); } - -/* insch.c */ -int winsch(win, c) register struct _win_st *win; char c; { static int x; return(x); } - -/* insertln.c */ -int winsertln(win) register struct _win_st *win; { static int x; return(x); } - -/* longname.c */ -char *longname(bp, def) register char *bp; register char *def; { static char *x; return(x); } - -/* move.c */ -int wmove(win, y, x) register struct _win_st *win; register int y; register int x; { static int z; return(z); } - -/* mvprintw.c */ -int mvprintw(y, x, fmt, __builtin_va_alist) register int y; register int x; char *fmt; int __builtin_va_alist; { static int z; return(z); } -int mvwprintw(win, y, x, fmt, __builtin_va_alist) register struct _win_st *win; register int y; register int x; char *fmt; int __builtin_va_alist; { static int z; return(z); } - -/* mvscanw.c */ -int mvscanw(y, x, fmt, __builtin_va_alist) register int y; register int x; char *fmt; int __builtin_va_alist; { static int z; return(z); } -int mvwscanw(win, y, x, fmt, __builtin_va_alist) register struct _win_st *win; register int y; register int x; char *fmt; int __builtin_va_alist; { static int z; return(z); } - -/* mvwin.c */ -int mvwin(win, by, bx) register struct _win_st *win; register int by; register int bx; { static int x; return(x); } - -/* newwin.c */ -struct _win_st *newwin(num_lines, num_cols, begy, begx) int num_lines; int num_cols; int begy; int begx; { static struct _win_st *x; return(x); } -struct _win_st *subwin(orig, num_lines, num_cols, begy, begx) register struct _win_st *orig; int num_lines; int num_cols; int begy; int begx; { static struct _win_st *x; return(x); } -int _set_subwin_(orig, win) register struct _win_st *orig; register struct _win_st *win; { static int x; return(x); } -int _swflags_(win) register struct _win_st *win; { static int x; return(x); } - -/* overlay.c */ -int overlay(win1, win2) register struct _win_st *win1; register struct _win_st *win2; { static int x; return(x); } - -/* overwrite.c */ -int overwrite(win1, win2) register struct _win_st *win1; register struct _win_st *win2; { static int x; return(x); } - -/* printw.c */ -int printw(fmt, __builtin_va_alist) char *fmt; int __builtin_va_alist; { static int x; return(x); } -int wprintw(win, fmt, __builtin_va_alist) struct _win_st *win; char *fmt; int __builtin_va_alist; { static int x; return(x); } -int _sprintw(win, fmt, ap) struct _win_st *win; char *fmt; va_list ap; { static int x; return(x); } - -/* putchar.c */ -char _putchar(c) register char c; { static char x; return(x); } - -/* refresh.c */ -int wrefresh(win) register struct _win_st *win; { static int x; return(x); } - -/* scanw.c */ -int scanw(fmt, __builtin_va_alist) char *fmt; int __builtin_va_alist; { static int x; return(x); } -int wscanw(win, fmt, __builtin_va_alist) struct _win_st *win; char *fmt; int __builtin_va_alist; { static int x; return(x); } -int _sscans(win, fmt, ap) struct _win_st *win; char *fmt; va_list ap; { static int x; return(x); } - -/* scroll.c */ -int scroll(win) register struct _win_st *win; { static int x; return(x); } - -/* standout.c */ -char *wstandout(win) register struct _win_st *win; { static char *x; return(x); } -char *wstandend(win) register struct _win_st *win; { static char *x; return(x); } - -/* toucholap.c */ -int touchoverlap(win1, win2) register struct _win_st *win1; register struct _win_st *win2; { static int x; return(x); } - -/* touchwin.c */ -int touchwin(win) register struct _win_st *win; { static int x; return(x); } -int touchline(win, y, sx, ex) register struct _win_st *win; register int y; register int sx; register int ex; { static int x; return(x); } - -/* tstp.c */ -void tstp() {} - -/* unctrl.c */ diff --git a/usr/src/ucblib/libcurses/sparc/Makefile b/usr/src/ucblib/libcurses/sparc/Makefile index d88f114405..79054c8e18 100644 --- a/usr/src/ucblib/libcurses/sparc/Makefile +++ b/usr/src/ucblib/libcurses/sparc/Makefile @@ -19,11 +19,9 @@ # CDDL HEADER END # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com @@ -32,4 +30,4 @@ BUILD.SO= $(CC) -o $@ -G $(DYNFLAGS) $(PICS) -L $(ROOT)/usr/ucblib $(LDLIBS) .KEEP_STATE: -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/ucblib/libcurses/sparcv9/Makefile b/usr/src/ucblib/libcurses/sparcv9/Makefile index 121bc4c173..e538678e29 100644 --- a/usr/src/ucblib/libcurses/sparcv9/Makefile +++ b/usr/src/ucblib/libcurses/sparcv9/Makefile @@ -19,11 +19,9 @@ # CDDL HEADER END # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com include ../../../lib/Makefile.lib.64 @@ -34,4 +32,4 @@ BUILD.SO= $(CC) $(CFLAGS) -o $@ -G $(DYNFLAGS) $(PICS) \ .KEEP_STATE: -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/ucblib/libdbm/Makefile.com b/usr/src/ucblib/libdbm/Makefile.com index 18157757c9..668444cfc8 100644 --- a/usr/src/ucblib/libdbm/Makefile.com +++ b/usr/src/ucblib/libdbm/Makefile.com @@ -19,11 +19,9 @@ # CDDL HEADER END # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# LIBRARY= libdbm.a VERS= .1 @@ -36,26 +34,12 @@ include $(SRC)/lib/Makefile.lib ROOTLIBDIR= $(ROOT)/usr/ucblib ROOTLIBDIR64= $(ROOT)/usr/ucblib/$(MACH64) -LIBS = $(DYNLIB) $(LINTLIB) - -LINTSRC= $(LINTLIB:%.ln=%) -ROOTLINTDIR= $(ROOTLIBDIR) -ROOTLINTDIR64= $(ROOTLIBDIR)/$(MACH64) -ROOTLINT= $(LINTSRC:%=$(ROOTLINTDIR)/%) -ROOTLINT64= $(LINTSRC:%=$(ROOTLINTDIR64)/%) - -# install rule for lint source file target -$(ROOTLINTDIR)/%: ../% - $(INS.file) -$(ROOTLINTDIR64)/%: ../% - $(INS.file) - -$(LINTLIB):= SRCS=../llib-ldbm +LIBS = $(DYNLIB) CFLAGS += $(CCVERBOSE) LDLIBS += -lc -CPPFLAGS = -I$(ROOT)/usr/ucbinclude $(CPPFLAGS.master) +CPPFLAGS = -I$(SRC)/ucbhead $(CPPFLAGS.master) .KEEP_STATE: diff --git a/usr/src/ucblib/libdbm/amd64/Makefile b/usr/src/ucblib/libdbm/amd64/Makefile index 5b91d3c694..20434991fd 100644 --- a/usr/src/ucblib/libdbm/amd64/Makefile +++ b/usr/src/ucblib/libdbm/amd64/Makefile @@ -19,11 +19,9 @@ # CDDL HEADER END # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com include ../../../lib/Makefile.lib.64 @@ -33,4 +31,4 @@ BUILD.SO= $(CC) $(CFLAGS) -o $@ -G $(DYNFLAGS) $(PICS) \ .KEEP_STATE: -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/ucblib/libdbm/dbm.c b/usr/src/ucblib/libdbm/dbm.c index 002bbd4eba..f006db5ea9 100644 --- a/usr/src/ucblib/libdbm/dbm.c +++ b/usr/src/ucblib/libdbm/dbm.c @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -20,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2002 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -32,8 +31,6 @@ * under license from the Regents of the University of California. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /*LINTLIBRARY*/ #include <sys/types.h> @@ -43,7 +40,7 @@ #include <strings.h> #include <malloc.h> #include <sys/stat.h> -#include <fcntl.h> +#include <sys/fcntl.h> #include <dbm.h> #include <errno.h> diff --git a/usr/src/ucblib/libdbm/i386/Makefile b/usr/src/ucblib/libdbm/i386/Makefile index e2080593d5..85705049e2 100644 --- a/usr/src/ucblib/libdbm/i386/Makefile +++ b/usr/src/ucblib/libdbm/i386/Makefile @@ -19,11 +19,9 @@ # CDDL HEADER END # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com @@ -31,4 +29,4 @@ BUILD.SO= $(CC) -o $@ $(GSHARED) $(DYNFLAGS) $(PICS) -L $(ROOT)/usr/ucblib $(LDL .KEEP_STATE: -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/ucblib/libdbm/llib-ldbm b/usr/src/ucblib/libdbm/llib-ldbm deleted file mode 100644 index 1b2f5e06e8..0000000000 --- a/usr/src/ucblib/libdbm/llib-ldbm +++ /dev/null @@ -1,42 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - * - * Copyright 1990 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -/* LINTLIBRARY */ - -#include <dbm.h> -#include <sys/stat.h> -#include <sys/types.h> - -/* dbm.c */ -int dbminit(file) char *file; { static int x; return(x); } -int dbmflush() { static int x; return(x); } -int dbmclose() { static int x; return(x); } -datum fetch(key) datum key; { static datum x; return(x); } -int delete(key) datum key; { static int x; return(x); } -int store(key, content) datum key; datum content; { static int x; return(x); } -datum firstkey() { static datum x; return(x); } -datum nextkey(key) datum key; { static datum x; return(x); } diff --git a/usr/src/ucblib/libdbm/sparc/Makefile b/usr/src/ucblib/libdbm/sparc/Makefile index e2a26e9aea..c9b8beb496 100644 --- a/usr/src/ucblib/libdbm/sparc/Makefile +++ b/usr/src/ucblib/libdbm/sparc/Makefile @@ -19,11 +19,9 @@ # CDDL HEADER END # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com @@ -31,4 +29,4 @@ BUILD.SO= $(CC) -o $@ -G $(DYNFLAGS) $(PICS) -L $(ROOT)/usr/ucblib $(LDLIBS) .KEEP_STATE: -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/ucblib/libdbm/sparcv9/Makefile b/usr/src/ucblib/libdbm/sparcv9/Makefile index 5b91d3c694..20434991fd 100644 --- a/usr/src/ucblib/libdbm/sparcv9/Makefile +++ b/usr/src/ucblib/libdbm/sparcv9/Makefile @@ -19,11 +19,9 @@ # CDDL HEADER END # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com include ../../../lib/Makefile.lib.64 @@ -33,4 +31,4 @@ BUILD.SO= $(CC) $(CFLAGS) -o $@ -G $(DYNFLAGS) $(PICS) \ .KEEP_STATE: -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/ucblib/librpcsoc/Makefile.com b/usr/src/ucblib/librpcsoc/Makefile.com index 86a4edf8a8..9931ff87ab 100644 --- a/usr/src/ucblib/librpcsoc/Makefile.com +++ b/usr/src/ucblib/librpcsoc/Makefile.com @@ -19,11 +19,9 @@ # CDDL HEADER END # # -# Copyright 2007 Sun Microsystems, Inc. All rights reserved. +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# LIBRARY= librpcsoc.a VERS = .1 @@ -49,10 +47,7 @@ DYNFLAGS += $(ZINTERPOSE) ROOTLIBDIR= $(ROOT)/usr/ucblib ROOTLIBDIR64= $(ROOT)/usr/ucblib/$(MACH64) -LINTSRC= $(LINTLIB:%.ln=%) -$(LINTLIB):= SRCS=../$(LINTSRC) - -CPPFLAGS = -I$(ROOT)/usr/ucbinclude -I../../../lib/libc/inc $(CPPFLAGS.master) +CPPFLAGS = -I$(SRC)/ucbhead -I../../../lib/libc/inc $(CPPFLAGS.master) .KEEP_STATE: @@ -62,6 +57,3 @@ lint: lintcheck include $(SRC)/lib/Makefile.targ include ../../Makefile.ucbtarg -# install rule for lint library target -$(ROOTLINTDIR)/%: ../% - $(INS.file) diff --git a/usr/src/ucblib/librpcsoc/amd64/Makefile b/usr/src/ucblib/librpcsoc/amd64/Makefile index 57275bc453..49026576ef 100644 --- a/usr/src/ucblib/librpcsoc/amd64/Makefile +++ b/usr/src/ucblib/librpcsoc/amd64/Makefile @@ -19,11 +19,9 @@ # CDDL HEADER END # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com include $(SRC)/lib/Makefile.lib.64 @@ -32,7 +30,7 @@ DYNFLAGS += $(DYNFLAGS64) BUILD.SO= $(CC) $(CFLAGS) -o $@ -G $(DYNFLAGS) $(PICS) \ -L $(ROOT)/usr/ucblib/$(MACH64) -L $(ROOT)/usr/lib/$(MACH64) $(LDLIBS) -LIBS= $(DYNLIB) $(LINTLIB) +LIBS= $(DYNLIB) .KEEP_STATE: diff --git a/usr/src/ucblib/librpcsoc/i386/Makefile b/usr/src/ucblib/librpcsoc/i386/Makefile index 2912bdb172..8c2e44b15a 100644 --- a/usr/src/ucblib/librpcsoc/i386/Makefile +++ b/usr/src/ucblib/librpcsoc/i386/Makefile @@ -19,21 +19,19 @@ # CDDL HEADER END # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com DYNFLAGS += $(DYNFLAGS32) BUILD.SO= $(CC) -o $@ $(GSHARED) $(DYNFLAGS) $(PICS) -L $(ROOT)/usr/ucblib $(LDLIBS) -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) .KEEP_STATE: all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/ucblib/librpcsoc/llib-lrpcsoc b/usr/src/ucblib/librpcsoc/llib-lrpcsoc deleted file mode 100644 index 68a07ff75f..0000000000 --- a/usr/src/ucblib/librpcsoc/llib-lrpcsoc +++ /dev/null @@ -1,71 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright (c) 1997 by Sun Microsystems, Inc. - * All rights reserved. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -/* LINTLIBRARY */ - -#include <stdio.h> -#include <rpc/rpc.h> -#include <sys/socket.h> -#include <sys/time.h> -#include <netdb.h> -#include <errno.h> -#include <rpc/pmap_clnt.h> -#include <sys/syslog.h> -#include <sys/ioctl.h> -#include <sys/filio.h> -#include <sys/types.h> -#include <sys/errno.h> -#include <netinet/in.h> - -/* clnt_tcp.c */ -CLIENT *clnttcp_create(struct sockaddr_in *, ulong_t, ulong_t, - int *, uint_t, uint_t); - -/* clnt_udp.c */ -CLIENT *clntudp_bufcreate(struct sockaddr_in *, ulong_t, ulong_t, - struct timeval, int *, uint_t, uint_t); -CLIENT *clntudp_create(struct sockaddr_in *, ulong_t, ulong_t, - struct timeval wait, int *); - -/* get_myaddress.c */ -int get_myaddress(struct sockaddr_in *); - -/* getrpcport.c */ -int getrpcport(char *, int, int, int); - -/* rtime.c */ -int rtime(struct sockaddr_in *, struct timeval *, struct timeval *); - -/* svc_tcp.c */ -SVCXPRT *svctcp_create(int, uint_t, uint_t); -SVCXPRT *svcfd_create(int, uint_t, uint_t); - -/* svc_udp.c */ -SVCXPRT *svcudp_bufcreate(int, uint_t, uint_t); -SVCXPRT *svcudp_create(int); -int svcudp_enablecache(SVCXPRT *, ulong_t); diff --git a/usr/src/ucblib/librpcsoc/sparc/Makefile b/usr/src/ucblib/librpcsoc/sparc/Makefile index 3dffb149aa..ebb1fecfe8 100644 --- a/usr/src/ucblib/librpcsoc/sparc/Makefile +++ b/usr/src/ucblib/librpcsoc/sparc/Makefile @@ -19,21 +19,19 @@ # CDDL HEADER END # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com DYNFLAGS += $(DYNFLAGS32) BUILD.SO= $(CC) -o $@ -G $(DYNFLAGS) $(PICS) -L $(ROOT)/usr/ucblib $(LDLIBS) -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) .KEEP_STATE: all: $(LIBS) -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/ucblib/librpcsoc/sparcv9/Makefile b/usr/src/ucblib/librpcsoc/sparcv9/Makefile index 57275bc453..49026576ef 100644 --- a/usr/src/ucblib/librpcsoc/sparcv9/Makefile +++ b/usr/src/ucblib/librpcsoc/sparcv9/Makefile @@ -19,11 +19,9 @@ # CDDL HEADER END # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com include $(SRC)/lib/Makefile.lib.64 @@ -32,7 +30,7 @@ DYNFLAGS += $(DYNFLAGS64) BUILD.SO= $(CC) $(CFLAGS) -o $@ -G $(DYNFLAGS) $(PICS) \ -L $(ROOT)/usr/ucblib/$(MACH64) -L $(ROOT)/usr/lib/$(MACH64) $(LDLIBS) -LIBS= $(DYNLIB) $(LINTLIB) +LIBS= $(DYNLIB) .KEEP_STATE: diff --git a/usr/src/ucblib/libtermcap/Makefile.com b/usr/src/ucblib/libtermcap/Makefile.com index 4f98d37dfd..2bc6e3ca2e 100644 --- a/usr/src/ucblib/libtermcap/Makefile.com +++ b/usr/src/ucblib/libtermcap/Makefile.com @@ -19,11 +19,9 @@ # CDDL HEADER END # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# LIBRARY= libtermcap.a VERS= .1 @@ -38,28 +36,14 @@ include $(SRC)/lib/Makefile.lib ROOTLIBDIR= $(ROOT)/usr/ucblib ROOTLIBDIR64= $(ROOT)/usr/ucblib/$(MACH64) -LIBS = $(DYNLIB) $(LINTLIB) - -LINTSRC= $(LINTLIB:%.ln=%) -ROOTLINTDIR= $(ROOTLIBDIR) -ROOTLINTDIR64= $(ROOTLIBDIR)/$(MACH64) -ROOTLINT= $(LINTSRC:%=$(ROOTLINTDIR)/%) -ROOTLINT64= $(LINTSRC:%=$(ROOTLINTDIR64)/%) - -# install rule for lint source file target -$(ROOTLINTDIR)/%: ../% - $(INS.file) -$(ROOTLINTDIR64)/%: ../% - $(INS.file) - -$(LINTLIB):= SRCS=../llib-ltermcap +LIBS = $(DYNLIB) CFLAGS += $(CCVERBOSE) CFLAGS64 += $(CCVERBOSE) LDLIBS += -lc DEFS= -DCM_N -DCM_GT -DCM_B -DCM_D -CPPFLAGS = $(DEFS) -I$(ROOT)/usr/ucbinclude $(CPPFLAGS.master) +CPPFLAGS = $(DEFS) -I$(SRC)/ucbhead $(CPPFLAGS.master) .KEEP_STATE: diff --git a/usr/src/ucblib/libtermcap/amd64/Makefile b/usr/src/ucblib/libtermcap/amd64/Makefile index 5567585245..4faa7cf698 100644 --- a/usr/src/ucblib/libtermcap/amd64/Makefile +++ b/usr/src/ucblib/libtermcap/amd64/Makefile @@ -19,11 +19,9 @@ # CDDL HEADER END # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com include $(SRC)/lib/Makefile.lib.64 @@ -34,4 +32,4 @@ BUILD.SO= $(CC) $(CFLAGS) -o $@ -G $(DYNFLAGS) $(PICS) \ .KEEP_STATE: -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/ucblib/libtermcap/i386/Makefile b/usr/src/ucblib/libtermcap/i386/Makefile index e2080593d5..85705049e2 100644 --- a/usr/src/ucblib/libtermcap/i386/Makefile +++ b/usr/src/ucblib/libtermcap/i386/Makefile @@ -19,11 +19,9 @@ # CDDL HEADER END # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com @@ -31,4 +29,4 @@ BUILD.SO= $(CC) -o $@ $(GSHARED) $(DYNFLAGS) $(PICS) -L $(ROOT)/usr/ucblib $(LDL .KEEP_STATE: -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/ucblib/libtermcap/llib-ltermcap b/usr/src/ucblib/libtermcap/llib-ltermcap deleted file mode 100644 index 8c3ecc759f..0000000000 --- a/usr/src/ucblib/libtermcap/llib-ltermcap +++ /dev/null @@ -1,45 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - * - * Copyright 1990 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -/* LINTLIBRARY */ - -#include <sgtty.h> -#include <ctype.h> -#include <sys/ioctl.h> - -/* termcap.c */ -int tgetent(bp, name) char *bp; char *name; { static int x; return(x); } -int tgetnum(id) char *id; { static int x; return(x); } -int tgetflag(id) char *id; { static int x; return(x); } -char *tgetstr(id, area) char *id; char **area; { static char *x; return(x); } - -/* tgoto.c */ -char *tgoto(cm, destcol, destline) char *cm; int destcol; int destline; { static char *x; return(x); } - -/* tputs.c */ -int tputs(cp, affcnt, outc) register char *cp; int affcnt; int (*outc)(); { static int x; return(x); } - diff --git a/usr/src/ucblib/libtermcap/sparc/Makefile b/usr/src/ucblib/libtermcap/sparc/Makefile index e2a26e9aea..c9b8beb496 100644 --- a/usr/src/ucblib/libtermcap/sparc/Makefile +++ b/usr/src/ucblib/libtermcap/sparc/Makefile @@ -19,11 +19,9 @@ # CDDL HEADER END # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com @@ -31,4 +29,4 @@ BUILD.SO= $(CC) -o $@ -G $(DYNFLAGS) $(PICS) -L $(ROOT)/usr/ucblib $(LDLIBS) .KEEP_STATE: -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/ucblib/libtermcap/sparcv9/Makefile b/usr/src/ucblib/libtermcap/sparcv9/Makefile index 5567585245..4faa7cf698 100644 --- a/usr/src/ucblib/libtermcap/sparcv9/Makefile +++ b/usr/src/ucblib/libtermcap/sparcv9/Makefile @@ -19,11 +19,9 @@ # CDDL HEADER END # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com include $(SRC)/lib/Makefile.lib.64 @@ -34,4 +32,4 @@ BUILD.SO= $(CC) $(CFLAGS) -o $@ -G $(DYNFLAGS) $(PICS) \ .KEEP_STATE: -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/ucblib/libucb/Makefile.com b/usr/src/ucblib/libucb/Makefile.com index 079a9a94d9..a2a2b5c2c9 100644 --- a/usr/src/ucblib/libucb/Makefile.com +++ b/usr/src/ucblib/libucb/Makefile.com @@ -19,11 +19,9 @@ # CDDL HEADER END # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# LIBRARY= libucb.a VERS= .1 @@ -87,27 +85,13 @@ SRCS= $(PORTGENOBJS:%.o=../port/gen/%.c) \ $(PORTSTDIOOBJS:%.o=../port/stdio/%.c) \ $(PORTSYSOBJS:%.o=../port/sys/%.c) -LIBS = $(DYNLIB) $(LINTLIB) - -LINTSRC= $(LINTLIB:%.ln=%) -ROOTLINTDIR= $(ROOTLIBDIR) -ROOTLINTDIR64= $(ROOTLIBDIR)/$(MACH64) -ROOTLINT= $(LINTSRC:%=$(ROOTLINTDIR)/%) -ROOTLINT64= $(LINTSRC:%=$(ROOTLINTDIR64)/%) - -# install rule for lint source file target -$(ROOTLINTDIR)/%: ../port/% - $(INS.file) -$(ROOTLINTDIR64)/%: ../% - $(INS.file) - -$(LINTLIB):= SRCS=../port/llib-lucb +LIBS = $(DYNLIB) CFLAGS += $(CCVERBOSE) CFLAGS64 += $(CCVERBOSE) LDLIBS += -lelf -lc -CPPFLAGS = -D$(MACH) -I$(ROOT)/usr/ucbinclude -I../inc \ +CPPFLAGS = -D$(MACH) -I$(SRC)/ucbhead -I../inc \ -I../../../lib/libc/inc $(CPPFLAGS.master) ASFLAGS= -P -D__STDC__ -DLOCORE -D_SYS_SYS_S -D_ASM $(CPPFLAGS) diff --git a/usr/src/ucblib/libucb/amd64/Makefile b/usr/src/ucblib/libucb/amd64/Makefile index 99d85cfe7c..564565f610 100644 --- a/usr/src/ucblib/libucb/amd64/Makefile +++ b/usr/src/ucblib/libucb/amd64/Makefile @@ -19,11 +19,9 @@ # CDDL HEADER END # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# SYSOBJS= signal.o @@ -40,4 +38,4 @@ pics/%.o: ../$(MACH)/sys/%.c .KEEP_STATE: -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/ucblib/libucb/amd64/llib-lucb b/usr/src/ucblib/libucb/amd64/llib-lucb deleted file mode 100644 index 4e91e5210a..0000000000 --- a/usr/src/ucblib/libucb/amd64/llib-lucb +++ /dev/null @@ -1,256 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -#include <sys/time.h> -#include <varargs.h> -#include <stdio.h> -#include <sys/types.h> -#include <errno.h> -#include <sys/syscall.h> -#include <sys/siginfo.h> -#include <sys/ucontext.h> -#include <signal.h> -#include <ucontext.h> -#include <setjmp.h> -#include <sys/resource.h> -#include <sys/utsname.h> -#include <sys/systeminfo.h> -#include <sys/errno.h> -#include <sys/unistd.h> -#include <sys/mman.h> -#include <sys/uadmin.h> -#include <sys/times.h> -#include <wait.h> -#include <sys/procset.h> -#include <sys/param.h> -#include <values.h> -#include <ctype.h> -#include <nan.h> -#include <memory.h> -#include <string.h> -#include <locale.h> -#include <fcntl.h> -#include <nlist.h> -#include <sys/dir.h> -#include <sys/stat.h> -#include <sys/priocntl.h> -#include <sys/file.h> -#include <sys/fcntl.h> -#include <sys/statvfs.h> -#include <sys/vfs.h> - -#include <sys/timeb.h> - -/* port/sys/gettimeofday.c */ -int gettimeofday(struct timeval *tp, void *tzp); -int settimeofday(struct timeval *tp, void *tzp); - -/* port/sys/signal.c */ -int _sigvechandler(int sig, siginfo_t *sip, ucontext_t *ucp); -int _sigsetmask(int mask); -int ucbsigsetmask(int mask); -int _sigblock(int mask); -int ucbsigblock(int mask); -int usigpause(int mask); -int ucbsigpause(int mask); -int _sigvec(int sig, struct sigvec *nvec, struct sigvec *ovec); -int ucbsigvec(int sig, struct sigvec *nvec, struct sigvec *ovec); -int _sigstack(struct sigstack *nss, struct sigstack *oss); -void ucbsignal(int s, void (*a)()); -void usignal(int s, void (*a)()); -int _siginterrupt(int sig, int flag); -int ucbsiginterrupt(int sig, int flag); - -/* port/sys/setjmp.c */ -int setjmp(jmp_buf env); -int _setjmp(jmp_buf env); -void _longjmp(jmp_buf env, int val); -void longjmp(jmp_buf env, int val); - -/* port/sys/getdtblsize.c */ -int getdtablesize(void); - -/* port/sys/gethostid.c */ -long gethostid(void); - -/* port/sys/gethostname.c */ -int gethostname(char *name, int namelen); -int sethostname(char *name, int namelen); - -/* port/sys/getpagesize.c */ -int getpagesize(void); - -/* port/sys/killpg.c */ -int killpg(int pgrp, int sig); - -/* port/sys/mctl.c */ -int mctl(caddr_t addr, size_t len, int function, int arg); - -/* port/sys/reboot.c */ -int reboot(int howto, char *bootargs); - -/* port/sys/setreid.c */ -int setreuid(int ruid, int euid); -int setregid(int rgid, int egid); - -/* port/sys/wait3.c */ -int wait3(int *status, int options, struct rusage *rp); -int wstat(int code, int status); - -/* port/sys/wait4.c */ -pid_t wait4(pid_t pid, int *status, int options, struct rusage *rusage); - -/* port/sys/getrusage.c */ -int getrusage(int who, struct rusage *rusage); - -/* port/sys/setpgrp.c */ -int setpgrp(pid_t pid1, pid_t pid2); - -/* port/stdio/sprintf.c */ -char *sprintf(const char *string, const char *format, ...); - -/* port/stdio/doprnt.c */ -int _doprnt(char *format, va_list in_args, FILE *iop); -/* - * void _mkarglst(fmt, args, arglst) char *fmt; stva_list args; - * stva_list arglst[]; {} - * void _getarg(fmt, pargs, argno) char *fmt; stva_list *pargs; int argno; {} - */ - -/* port/stdio/fopen.c */ -FILE *fopen(const char *file, const char *mode); -FILE *freopen(const char *file, const char *mode, FILE *iop); - -/* port/stdio/fprintf.c */ -int fprintf(FILE *iop, const char *format, ...); - -/* port/stdio/printf.c */ -/* VARARGS1 */ -int printf(const char *format, ...); - -/* port/stdio/vfprintf.c */ -/* VARARGS 2 */ -int vfprintf(FILE *iop, const char *format, va_list); - -/* port/stdio/vprintf.c */ -/* VARARGS 1 */ -int vprintf(const char *format, va_list); - -/* port/stdio/vsprintf.c */ -/* VARARGS 2 */ -char *vsprintf(char *string, char *format, va_list); - -/* port/gen/nlist.c */ -int nlist(const char *name, struct nlist *list); - -/* port/gen/readdir.c */ -struct direct *readdir(DIR *dirp); - -/* port/gen/scandir.c */ -int scandir(char *dirname, struct direct *(*namelist[]), int (*select)(), - int (*dcomp)()); -int alphasort(struct direct **d1, struct direct **d2); - -/* port/gen/setpriority.c */ -int getpriority(int which, int who); -int setpriority(int which, int who, int prio); - -/* port/gen/siglist.c */ - -/* port/gen/_psignal.c */ -void _psignal(unsigned sig, char *s); - -/* port/gen/bcmp.c */ -int bcmp(char *s1, char *s2, int len); - -/* port/gen/bcopy.c */ -void bcopy(char *s1, char *s2, int len); - -/* port/gen/bzero.c */ -void bzero(char *sp, int len); - -/* port/gen/ftime.c */ -int ftime(struct timeb *tp); - -/* port/gen/getusershell.c */ -char *getusershell(void); -int endusershell(void); -int setusershell(void); - -/* port/gen/getwd.c */ -char *getwd(char *pathname); - -/* port/gen/index.c */ -char *index(char *sp, char c); - -/* port/gen/mkstemp.c */ -int mkstemp(char *as); - -/* port/gen/nice.c */ -int nice(int incr); - -/* port/gen/psignal.c */ -void psignal(unsigned sig, char *s); - -/* port/gen/rand.c */ -int srand(unsigned x); -int rand(void); - -/* port/gen/random.c */ -int srandom(unsigned x); -char *initstate(unsigned seed, char *arg_state, int n); -char *setstate(char *arg_state); -long random(void); - -/* port/gen/regex.c */ -char *re_comp(char *sp); -int re_exec(char *p1); - -/* port/gen/rindex.c */ -char *rindex(char *sp, char c); - -/* port/gen/setbuffer.c */ -void setbuffer(FILE *iop, char *abuf, int asize); -int setlinebuf(FILE *iop); - -/* port/gen/statfs.c */ -int statfs(char *path, struct statfs *buf); -int fstatfs(int fd, struct statfs *buf); -int cnvtvfs(struct statfs *buf, struct statvfs *vbuf); - -/* port/gen/times.c */ -clock_t times(struct tms *tmsp); - -/* port/gen/ualarm.c */ -unsigned ualarm(unsigned usecs, unsigned reload); - -/* port/gen/usleep.c */ -int usleep(unsigned n); diff --git a/usr/src/ucblib/libucb/i386/Makefile b/usr/src/ucblib/libucb/i386/Makefile index 8edc02b3de..d1041b19a3 100644 --- a/usr/src/ucblib/libucb/i386/Makefile +++ b/usr/src/ucblib/libucb/i386/Makefile @@ -19,11 +19,9 @@ # CDDL HEADER END # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# SYSOBJS= \ signal.o @@ -36,4 +34,4 @@ DYNFLAGS += $(DYNFLAGS32) .KEEP_STATE: -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/ucblib/libucb/port/gen/nlist.c b/usr/src/ucblib/libucb/port/gen/nlist.c index 02ef8371e0..b99967e0ec 100644 --- a/usr/src/ucblib/libucb/port/gen/nlist.c +++ b/usr/src/ucblib/libucb/port/gen/nlist.c @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -20,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 1997 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -37,15 +36,13 @@ * contributors. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /*LINTLIBRARY*/ #include <sys/types.h> #include "libelf.h" #include <stdlib.h> #include <unistd.h> -#include <fcntl.h> +#include <sys/fcntl.h> #include <nlist.h> #include <sys/file.h> #include <string.h> diff --git a/usr/src/ucblib/libucb/port/llib-lucb b/usr/src/ucblib/libucb/port/llib-lucb deleted file mode 100644 index d1f187baab..0000000000 --- a/usr/src/ucblib/libucb/port/llib-lucb +++ /dev/null @@ -1,250 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -#include <sys/time.h> -#include <varargs.h> -#include <stdio.h> -#include <sys/types.h> -#include <errno.h> -#include <sys/syscall.h> -#include <sys/siginfo.h> -#include <sys/ucontext.h> -#include <signal.h> -#include <ucontext.h> -#include <setjmp.h> -#include <sys/resource.h> -#include <sys/utsname.h> -#include <sys/systeminfo.h> -#include <sys/errno.h> -#include <unistd.h> -#include <sys/mman.h> -#include <sys/uadmin.h> -#include <sys/times.h> -#include <wait.h> -#include <sys/procset.h> -#include <sys/param.h> -#include <values.h> -#include <ctype.h> -#include <nan.h> -#include <memory.h> -#include <string.h> -#include <locale.h> -#include <fcntl.h> -#include <nlist.h> -#include <sys/dir.h> -#include <sys/stat.h> -#include <sys/priocntl.h> -#include <sys/file.h> -#include <sys/fcntl.h> -#include <sys/statvfs.h> -#include <sys/vfs.h> - -#include <sys/timeb.h> - -/* port/sys/gettimeofday.c */ -int gettimeofday(struct timeval *, void *); -int settimeofday(struct timeval *, void *); - -/* port/sys/signal.c */ -int _sigvechandler(int, siginfo_t *, ucontext_t *); -int _sigsetmask(int); -int ucbsigsetmask(int); -int _sigblock(int); -int ucbsigblock(int); -int usigpause(int); -int ucbsigpause(int); -int _sigvec(int, struct sigvec *, struct sigvec *); -int ucbsigvec(int, struct sigvec *, struct sigvec *); -int _sigstack(struct sigstack *, struct sigstack *); -void ucbsignal(int, void (*)()); -void usignal(int, void (*)()); -int _siginterrupt(int, int); -int ucbsiginterrupt(int, int); -#ifdef sparc -void __sigcleanup(struct sigcontext *); -#endif - -/* port/sys/flock.c */ -int flock(int, int); - -/* port/sys/getdtblsize.c */ -int getdtablesize(void); - -/* port/sys/gethostid.c */ -long gethostid(void); - -/* port/sys/gethostname.c */ -int gethostname(char *, int); -int sethostname(char *, int); - -/* port/sys/getpagesize.c */ -int getpagesize(void); - -/* port/sys/killpg.c */ -int killpg(int, int); - -/* port/sys/mctl.c */ -int mctl(caddr_t, size_t, int, int); - -/* port/sys/reboot.c */ -int reboot(int, char *); - -/* port/sys/setreid.c */ -int setreuid(int, int); -int setregid(int, int); - -/* port/sys/wait3.c */ -int wait3(int *, int, struct rusage *); -int wstat(int, int); - -/* port/sys/wait4.c */ -int wait4(pid_t, int *, int, struct rusage *); - -/* port/sys/getrusage.c */ -int getrusage(int, struct rusage *); - -/* port/sys/setpgrp.c */ -int setpgrp(pid_t, pid_t); - -/* port/stdio/sprintf.c */ -char *sprintf(const char *, const char *, ...); - -/* port/stdio/doprnt.c */ -int _doprnt(char *, va_list, FILE *); -/* void _mkarglst(char *, stva_list args, stva_list arglst[]); */ -/* void _getarg(char *, stva_list *, int); */ - - - - -/* port/stdio/fopen.c */ -FILE *fopen(const char *, const char *); -FILE *fopen64(const char *, const char *); -FILE *freopen(const char *, const char *, FILE *); -FILE *freopen64(const char *, const char *, FILE *); - -/* port/stdio/fprintf.c */ -int fprintf(FILE *, const char *, ...); - -/* port/stdio/printf.c */ -/* VARARGS1 */ -int printf(const char *, ...); - -/* port/stdio/vfprintf.c */ -/* VARARGS2 */ -int vfprintf(FILE *, const char *, va_list); - -/* port/stdio/vprintf.c */ -/* VARARGS1 */ -int vprintf(const char *, va_list); - -/* port/stdio/vsprintf.c */ -/* VARARGS2 */ -char *vsprintf(char *, char *, va_list); - -/* port/gen/nlist.c */ -int nlist(const char *, struct nlist *); - -/* port/gen/setpriority.c */ -int getpriority(int, int); -int setpriority(int, int, int); - -/* port/gen/siglist.c */ - -/* port/gen/_psignal.c */ -void _psignal(unsigned, char *); - -/* port/gen/bcmp.c */ -int bcmp(char *, char *, int); - -/* port/gen/bcopy.c */ -void bcopy(char *, char *, int); - -/* port/gen/bzero.c */ -void bzero(char *, int); - -/* port/gen/ftime.c */ -int ftime(struct timeb *); - -/* port/gen/getusershell.c */ -char *getusershell(void); -int endusershell(void); -int setusershell(void); - -/* port/gen/getwd.c */ -char *getwd(char *); - -/* port/gen/index.c */ -char *index(char *, char); - -/* port/gen/mkstemp.c */ -int mkstemp(char *); - -/* port/gen/nice.c */ -int nice(int); - -/* port/gen/psignal.c */ -void psignal(unsigned, char *); - -/* port/gen/rand.c */ -int srand(unsigned); -int rand(void); - -/* port/gen/random.c */ -int srandom(unsigned); -char *initstate(unsigned, char *, int); -char *setstate(char *); -long random(void); - -/* port/gen/regex.c */ -char *re_comp(char *); -int re_exec(char *); - -/* port/gen/rindex.c */ -char *rindex(char *, char); - -/* port/gen/setbuffer.c */ -void setbuffer(FILE *, char *, int); -int setlinebuf(FILE *); - -/* port/gen/statfs.c */ -int statfs(char *, struct statfs *); -int fstatfs(int, struct statfs *); -int cnvtvfs(struct statfs *, struct statvfs *); - -/* port/gen/times.c */ -clock_t times(struct tms *); - -/* port/gen/ualarm.c */ -unsigned ualarm(unsigned, unsigned); - -/* port/gen/usleep.c */ -int usleep(unsigned); diff --git a/usr/src/ucblib/libucb/port/stdio/fopen.c b/usr/src/ucblib/libucb/port/stdio/fopen.c index c6fcb4ee42..01ab2dde2c 100644 --- a/usr/src/ucblib/libucb/port/stdio/fopen.c +++ b/usr/src/ucblib/libucb/port/stdio/fopen.c @@ -20,7 +20,7 @@ */ /* - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -37,14 +37,12 @@ * contributors. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /*LINTLIBRARY*/ #include <sys/types.h> #include "file64.h" #include <stdio.h> -#include <fcntl.h> +#include <sys/fcntl.h> #include <unistd.h> #include <sys/file.h> #include "stdiom.h" diff --git a/usr/src/ucblib/libucb/port/sys/flock.c b/usr/src/ucblib/libucb/port/sys/flock.c index 7bc8d034cb..ee473bf2f8 100644 --- a/usr/src/ucblib/libucb/port/sys/flock.c +++ b/usr/src/ucblib/libucb/port/sys/flock.c @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -20,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 1997 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -32,13 +31,11 @@ * under license from the Regents of the University of California. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /*LINTLIBRARY*/ #include <sys/types.h> #include <sys/file.h> -#include <fcntl.h> +#include <sys/fcntl.h> #include <errno.h> int diff --git a/usr/src/ucblib/libucb/sparc/Makefile b/usr/src/ucblib/libucb/sparc/Makefile index ceceefc9ba..bfa844235b 100644 --- a/usr/src/ucblib/libucb/sparc/Makefile +++ b/usr/src/ucblib/libucb/sparc/Makefile @@ -19,11 +19,9 @@ # CDDL HEADER END # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# SYSOBJS= \ setjmp.o \ @@ -41,4 +39,4 @@ pics/%.o: sys/%.s .KEEP_STATE: -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/ucblib/libucb/sparcv9/Makefile b/usr/src/ucblib/libucb/sparcv9/Makefile index 90e748660f..89af3cc63e 100644 --- a/usr/src/ucblib/libucb/sparcv9/Makefile +++ b/usr/src/ucblib/libucb/sparcv9/Makefile @@ -19,11 +19,9 @@ # CDDL HEADER END # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# SYSOBJS= \ setjmp.o \ @@ -47,4 +45,4 @@ pics/%.o: sys/%.s .KEEP_STATE: -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/ucblib/libucb/sparcv9/llib-lucb b/usr/src/ucblib/libucb/sparcv9/llib-lucb deleted file mode 100644 index ef235b901e..0000000000 --- a/usr/src/ucblib/libucb/sparcv9/llib-lucb +++ /dev/null @@ -1,256 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright (c) 1995-1997, by Sun Microsystems, Inc. - * All Rights Reserved - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -#include <sys/time.h> -#include <varargs.h> -#include <stdio.h> -#include <sys/types.h> -#include <errno.h> -#include <sys/syscall.h> -#include <sys/siginfo.h> -#include <sys/ucontext.h> -#include <signal.h> -#include <ucontext.h> -#include <setjmp.h> -#include <sys/resource.h> -#include <sys/utsname.h> -#include <sys/systeminfo.h> -#include <sys/errno.h> -#include <sys/unistd.h> -#include <sys/mman.h> -#include <sys/uadmin.h> -#include <sys/times.h> -#include <wait.h> -#include <sys/procset.h> -#include <sys/param.h> -#include <values.h> -#include <ctype.h> -#include <nan.h> -#include <memory.h> -#include <string.h> -#include <locale.h> -#include <fcntl.h> -#include <nlist.h> -#include <sys/dir.h> -#include <sys/stat.h> -#include <sys/priocntl.h> -#include <sys/file.h> -#include <sys/fcntl.h> -#include <sys/statvfs.h> -#include <sys/vfs.h> - -#include <sys/timeb.h> - -/* port/sys/gettimeofday.c */ -int gettimeofday(struct timeval *tp, void *tzp); -int settimeofday(struct timeval *tp, void *tzp); - -/* port/sys/signal.c */ -int _sigvechandler(int sig, siginfo_t *sip, ucontext_t *ucp); -int _sigsetmask(int mask); -int ucbsigsetmask(int mask); -int _sigblock(int mask); -int ucbsigblock(int mask); -int usigpause(int mask); -int ucbsigpause(int mask); -int _sigvec(int sig, struct sigvec *nvec, struct sigvec *ovec); -int ucbsigvec(int sig, struct sigvec *nvec, struct sigvec *ovec); -int _sigstack(struct sigstack *nss, struct sigstack *oss); -void ucbsignal(int s, void (*a)()); -void usignal(int s, void (*a)()); -int _siginterrupt(int sig, int flag); -int ucbsiginterrupt(int sig, int flag); - -/* port/sys/setjmp.c */ -int setjmp(jmp_buf env); -int _setjmp(jmp_buf env); -void _longjmp(jmp_buf env, int val); -void longjmp(jmp_buf env, int val); - -/* port/sys/getdtblsize.c */ -int getdtablesize(void); - -/* port/sys/gethostid.c */ -long gethostid(void); - -/* port/sys/gethostname.c */ -int gethostname(char *name, int namelen); -int sethostname(char *name, int namelen); - -/* port/sys/getpagesize.c */ -int getpagesize(void); - -/* port/sys/killpg.c */ -int killpg(int pgrp, int sig); - -/* port/sys/mctl.c */ -int mctl(caddr_t addr, size_t len, int function, int arg); - -/* port/sys/reboot.c */ -int reboot(int howto, char *bootargs); - -/* port/sys/setreid.c */ -int setreuid(int ruid, int euid); -int setregid(int rgid, int egid); - -/* port/sys/wait3.c */ -int wait3(int *status, int options, struct rusage *rp); -int wstat(int code, int status); - -/* port/sys/wait4.c */ -pid_t wait4(pid_t pid, int *status, int options, struct rusage *rusage); - -/* port/sys/getrusage.c */ -int getrusage(int who, struct rusage *rusage); - -/* port/sys/setpgrp.c */ -int setpgrp(pid_t pid1, pid_t pid2); - -/* port/stdio/sprintf.c */ -char *sprintf(const char *string, const char *format, ...); - -/* port/stdio/doprnt.c */ -int _doprnt(char *format, va_list in_args, FILE *iop); -/* - * void _mkarglst(fmt, args, arglst) char *fmt; stva_list args; - * stva_list arglst[]; {} - * void _getarg(fmt, pargs, argno) char *fmt; stva_list *pargs; int argno; {} - */ - -/* port/stdio/fopen.c */ -FILE *fopen(const char *file, const char *mode); -FILE *freopen(const char *file, const char *mode, FILE *iop); - -/* port/stdio/fprintf.c */ -int fprintf(FILE *iop, const char *format, ...); - -/* port/stdio/printf.c */ -/* VARARGS1 */ -int printf(const char *format, ...); - -/* port/stdio/vfprintf.c */ -/* VARARGS 2 */ -int vfprintf(FILE *iop, const char *format, va_list); - -/* port/stdio/vprintf.c */ -/* VARARGS 1 */ -int vprintf(const char *format, va_list); - -/* port/stdio/vsprintf.c */ -/* VARARGS 2 */ -char *vsprintf(char *string, char *format, va_list); - -/* port/gen/nlist.c */ -int nlist(const char *name, struct nlist *list); - -/* port/gen/readdir.c */ -struct direct *readdir(DIR *dirp); - -/* port/gen/scandir.c */ -int scandir(char *dirname, struct direct *(*namelist[]), int (*select)(), - int (*dcomp)()); -int alphasort(struct direct **d1, struct direct **d2); - -/* port/gen/setpriority.c */ -int getpriority(int which, int who); -int setpriority(int which, int who, int prio); - -/* port/gen/siglist.c */ - -/* port/gen/_psignal.c */ -void _psignal(unsigned sig, char *s); - -/* port/gen/bcmp.c */ -int bcmp(char *s1, char *s2, int len); - -/* port/gen/bcopy.c */ -void bcopy(char *s1, char *s2, int len); - -/* port/gen/bzero.c */ -void bzero(char *sp, int len); - -/* port/gen/ftime.c */ -int ftime(struct timeb *tp); - -/* port/gen/getusershell.c */ -char *getusershell(void); -int endusershell(void); -int setusershell(void); - -/* port/gen/getwd.c */ -char *getwd(char *pathname); - -/* port/gen/index.c */ -char *index(char *sp, char c); - -/* port/gen/mkstemp.c */ -int mkstemp(char *as); - -/* port/gen/nice.c */ -int nice(int incr); - -/* port/gen/psignal.c */ -void psignal(unsigned sig, char *s); - -/* port/gen/rand.c */ -int srand(unsigned x); -int rand(void); - -/* port/gen/random.c */ -int srandom(unsigned x); -char *initstate(unsigned seed, char *arg_state, int n); -char *setstate(char *arg_state); -long random(void); - -/* port/gen/regex.c */ -char *re_comp(char *sp); -int re_exec(char *p1); - -/* port/gen/rindex.c */ -char *rindex(char *sp, char c); - -/* port/gen/setbuffer.c */ -void setbuffer(FILE *iop, char *abuf, int asize); -int setlinebuf(FILE *iop); - -/* port/gen/statfs.c */ -int statfs(char *path, struct statfs *buf); -int fstatfs(int fd, struct statfs *buf); -int cnvtvfs(struct statfs *buf, struct statvfs *vbuf); - -/* port/gen/times.c */ -clock_t times(struct tms *tmsp); - -/* port/gen/ualarm.c */ -unsigned ualarm(unsigned usecs, unsigned reload); - -/* port/gen/usleep.c */ -int usleep(unsigned n); |