BSD 4_3_Reno release

[unix-history] / usr / src / sys / sys / un.h

diff --git a/usr/src/sys/sys/un.h b/usr/src/sys/sys/un.h
index 6b6c509..c3e5114 100644 (file)
--- a/usr/src/sys/sys/un.h
+++ b/usr/src/sys/sys/un.h
@@ -2,24 +2,38 @@
  * Copyright (c) 1982, 1986 Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1982, 1986 Regents of the University of California.
  * All rights reserved.
  *

- * Redistribution and use in source and binary forms are permitted
- * provided that this notice is preserved and that due credit is given
- * to the University of California at Berkeley. The name of the University
- * may not be used to endorse or promote products derived from this
- * software without specific prior written permission. This software
- * is provided ``as is'' without express or implied warranty.
+ * Redistribution is only permitted until one year after the first shipment
+ * of 4.4BSD by the Regents.  Otherwise, redistribution and use in source and
+ * binary forms are permitted provided that: (1) source distributions retain
+ * this entire copyright notice and comment, and (2) distributions including
+ * binaries display the following acknowledgement:  This product includes
+ * software developed by the University of California, Berkeley and its
+ * contributors'' in the documentation or other materials provided with the
+ * distribution and in all advertising materials mentioning features or use
+ * of this software.  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.
+ * THIS SOFTWARE IS PROVIDED AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.

  *
  *

- *     @(#)un.h        7.2 (Berkeley) %G%
+ *     @(#)un.h        7.7 (Berkeley) 6/28/90

  */
 
 /*
  * Definitions for UNIX IPC domain.
  */
 struct sockaddr_un {
  */
 
 /*
  * Definitions for UNIX IPC domain.
  */
 struct sockaddr_un {

-       short   sun_family;             /* AF_UNIX */
-       char    sun_path[108];          /* path name (gag) */
+       u_char  sun_len;                /* sockaddr len including null */
+       u_char  sun_family;             /* AF_UNIX */
+       char    sun_path[104];          /* path name (gag) */

 };
 
 #ifdef KERNEL
 int    unp_discard();
 };
 
 #ifdef KERNEL
 int    unp_discard();

+#else
+
+/* actual length of an initialized sockaddr_un */
+#define SUN_LEN(su) \
+       (sizeof(*(su)) - sizeof((su)->sun_path) + strlen((su)->sun_path))

 #endif
 #endif