Browse Source

ANSIfy forkpty, add missing $OpenBSD$ in duid.c, style (no arg names) in

util.h.
ok guenther
OPENBSD_5_2
nicm 12 years ago
parent
commit
f6f6cc630f
3 changed files with 13 additions and 16 deletions
  1. +2
    -0
      src/lib/libutil/duid.c
  2. +2
    -6
      src/lib/libutil/pty.c
  3. +9
    -10
      src/lib/libutil/util.h

+ 2
- 0
src/lib/libutil/duid.c View File

@ -1,3 +1,5 @@
/* $OpenBSD: duid.c,v 1.2 2012/07/09 14:26:40 nicm Exp $ */
/* /*
* Copyright (c) 2010 Joel Sing <jsing@openbsd.org> * Copyright (c) 2010 Joel Sing <jsing@openbsd.org>
* *


+ 2
- 6
src/lib/libutil/pty.c View File

@ -1,4 +1,4 @@
/* $OpenBSD: pty.c,v 1.16 2012/04/26 05:55:36 matthew Exp $ */
/* $OpenBSD: pty.c,v 1.17 2012/07/09 14:26:40 nicm Exp $ */
/*- /*-
* Copyright (c) 1990, 1993 * Copyright (c) 1990, 1993
@ -81,11 +81,7 @@ openpty(int *amaster, int *aslave, char *name, struct termios *termp,
} }
pid_t pid_t
forkpty(amaster, name, termp, winp)
int *amaster;
char *name;
struct termios *termp;
struct winsize *winp;
forkpty(int *amaster, char *name, struct termios *termp, struct winsize *winp)
{ {
int master, slave; int master, slave;
pid_t pid; pid_t pid;


+ 9
- 10
src/lib/libutil/util.h View File

@ -1,4 +1,4 @@
/* $OpenBSD: util.h,v 1.29 2010/12/17 19:35:34 millert Exp $ */
/* $OpenBSD: util.h,v 1.30 2012/07/09 14:26:40 nicm Exp $ */
/* $NetBSD: util.h,v 1.2 1996/05/16 07:00:22 thorpej Exp $ */ /* $NetBSD: util.h,v 1.2 1996/05/16 07:00:22 thorpej Exp $ */
/*- /*-
@ -90,7 +90,7 @@ int opendev(const char *, int, int, char **);
int pidfile(const char *); int pidfile(const char *);
void pw_setdir(const char *); void pw_setdir(const char *);
char *pw_file(const char *); char *pw_file(const char *);
int pw_lock(int retries);
int pw_lock(int);
int pw_mkdb(char *, int); int pw_mkdb(char *, int);
int pw_abort(void); int pw_abort(void);
void pw_init(void); void pw_init(void);
@ -100,20 +100,19 @@ void pw_copy(int, int, const struct passwd *, const struct passwd *);
int pw_scan(char *, struct passwd *, int *); int pw_scan(char *, struct passwd *, int *);
void pw_error(const char *, int, int); void pw_error(const char *, int, int);
int openpty(int *, int *, char *, struct termios *, struct winsize *); int openpty(int *, int *, char *, struct termios *, struct winsize *);
int opendisk(const char *path, int flags, char *buf, size_t buflen,
int iscooked);
int opendisk(const char *, int, char *, size_t, int);
pid_t forkpty(int *, char *, struct termios *, struct winsize *); pid_t forkpty(int *, char *, struct termios *, struct winsize *);
int getmaxpartitions(void); int getmaxpartitions(void);
int getrawpartition(void); int getrawpartition(void);
void login_fbtab(const char *, uid_t, gid_t); void login_fbtab(const char *, uid_t, gid_t);
int login_check_expire(struct __sFILE *, struct passwd *, char *, int); int login_check_expire(struct __sFILE *, struct passwd *, char *, int);
char *readlabelfs(char *, int); char *readlabelfs(char *, int);
const char *uu_lockerr(int _uu_lockresult);
int uu_lock(const char *_ttyname);
int uu_lock_txfr(const char *_ttyname, pid_t _pid);
int uu_unlock(const char *_ttyname);
int fmt_scaled(long long number, char *result);
int scan_scaled(char *scaled, long long *result);
const char *uu_lockerr(int);
int uu_lock(const char *);
int uu_lock_txfr(const char *, pid_t);
int uu_unlock(const char *);
int fmt_scaled(long long, char *);
int scan_scaled(char *, long long *);
int isduid(const char *, int); int isduid(const char *, int);
__END_DECLS __END_DECLS


Loading…
Cancel
Save