| @@ -1,14 +1,14 @@ | | | @@ -1,14 +1,14 @@ |
1 | /* $NetBSD: util.h,v 1.61 2012/01/07 18:41:14 christos Exp $ */ | | 1 | /* $NetBSD: util.h,v 1.62 2012/04/07 04:04:21 christos Exp $ */ |
2 | | | 2 | |
3 | /*- | | 3 | /*- |
4 | * Copyright (c) 1995 | | 4 | * Copyright (c) 1995 |
5 | * The Regents of the University of California. All rights reserved. | | 5 | * The Regents of the University of California. All rights reserved. |
6 | * | | 6 | * |
7 | * Redistribution and use in source and binary forms, with or without | | 7 | * Redistribution and use in source and binary forms, with or without |
8 | * modification, are permitted provided that the following conditions | | 8 | * modification, are permitted provided that the following conditions |
9 | * are met: | | 9 | * are met: |
10 | * 1. Redistributions of source code must retain the above copyright | | 10 | * 1. Redistributions of source code must retain the above copyright |
11 | * notice, this list of conditions and the following disclaimer. | | 11 | * notice, this list of conditions and the following disclaimer. |
12 | * 2. Redistributions in binary form must reproduce the above copyright | | 12 | * 2. Redistributions in binary form must reproduce the above copyright |
13 | * notice, this list of conditions and the following disclaimer in the | | 13 | * notice, this list of conditions and the following disclaimer in the |
14 | * documentation and/or other materials provided with the distribution. | | 14 | * documentation and/or other materials provided with the distribution. |
| @@ -64,26 +64,27 @@ struct termios; | | | @@ -64,26 +64,27 @@ struct termios; |
64 | struct utmp; | | 64 | struct utmp; |
65 | struct winsize; | | 65 | struct winsize; |
66 | struct sockaddr; | | 66 | struct sockaddr; |
67 | | | 67 | |
68 | char *flags_to_string(unsigned long, const char *); | | 68 | char *flags_to_string(unsigned long, const char *); |
69 | pid_t forkpty(int *, char *, struct termios *, struct winsize *); | | 69 | pid_t forkpty(int *, char *, struct termios *, struct winsize *); |
70 | const char *getbootfile(void); | | 70 | const char *getbootfile(void); |
71 | off_t getlabeloffset(void); | | 71 | off_t getlabeloffset(void); |
72 | int getlabelsector(void); | | 72 | int getlabelsector(void); |
73 | int getlabelusesmbr(void); | | 73 | int getlabelusesmbr(void); |
74 | int getmaxpartitions(void); | | 74 | int getmaxpartitions(void); |
75 | int getrawpartition(void); | | 75 | int getrawpartition(void); |
76 | const char *getfstypename(int); | | 76 | const char *getfstypename(int); |
| | | 77 | const char *getfsspecname(char *, size_t, const char *); |
77 | #ifndef __LIBC12_SOURCE__ | | 78 | #ifndef __LIBC12_SOURCE__ |
78 | void login(const struct utmp *) __RENAME(__login50); | | 79 | void login(const struct utmp *) __RENAME(__login50); |
79 | void loginx(const struct utmpx *) __RENAME(__loginx50); | | 80 | void loginx(const struct utmpx *) __RENAME(__loginx50); |
80 | #endif | | 81 | #endif |
81 | int login_tty(int); | | 82 | int login_tty(int); |
82 | int logout(const char *); | | 83 | int logout(const char *); |
83 | int logoutx(const char *, int, int); | | 84 | int logoutx(const char *, int, int); |
84 | void logwtmp(const char *, const char *, const char *); | | 85 | void logwtmp(const char *, const char *, const char *); |
85 | void logwtmpx(const char *, const char *, const char *, int, int); | | 86 | void logwtmpx(const char *, const char *, const char *, int, int); |
86 | int opendisk(const char *, int, char *, size_t, int); | | 87 | int opendisk(const char *, int, char *, size_t, int); |
87 | int opendisk1(const char *, int, char *, size_t, int, | | 88 | int opendisk1(const char *, int, char *, size_t, int, |
88 | int (*)(const char *, int, ...)); | | 89 | int (*)(const char *, int, ...)); |
89 | int openpty(int *, int *, char *, struct termios *, | | 90 | int openpty(int *, int *, char *, struct termios *, |