From b4b4b5304bd22eab265c9c049cb7fc6b55c4ef3f Mon Sep 17 00:00:00 2001 From: Baptiste Daroussin Date: Sat, 28 Jan 2017 16:31:23 +0000 Subject: [PATCH] Revert crap accidentally committed --- bin/ed/Makefile | 2 +- contrib/dma/mail.c | 79 ++++-------- share/mk/bsd.doc.mk | 4 +- sys/amd64/amd64/db_trace.c | 15 --- sys/amd64/cloudabi64/cloudabi64_sysvec.c | 2 - sys/cam/ctl/ctl_ioctl.h | 2 +- sys/cddl/dev/fbt/x86/fbt_isa.c | 2 - sys/compat/cloudabi/cloudabi_fd.c | 1 - sys/compat/cloudabi64/cloudabi64_poll.c | 1 - .../linuxkpi/common/include/linux/slab.h | 8 -- .../acpica/components/namespace/nsxfeval.c | 40 +----- sys/contrib/dev/acpica/include/acpixf.h | 8 -- sys/ddb/ddb.h | 1 - sys/dev/drm2/drm_agpsupport.c | 14 +- sys/dev/drm2/drm_bufs.c | 122 +++++++++--------- sys/dev/drm2/drm_dma.c | 10 +- sys/dev/drm2/drm_drv.c | 3 +- sys/dev/drm2/drm_os_freebsd.c | 3 +- sys/dev/drm2/drm_os_freebsd.h | 2 +- sys/dev/drm2/drm_stub.c | 5 +- sys/fs/nfsserver/nfs_nfsdstate.c | 4 +- sys/kern/kern_descrip.c | 8 -- sys/kern/kern_shutdown.c | 8 -- sys/modules/drm2/drm2/Makefile | 2 + tools/build/Makefile | 5 - tools/tools/locale/etc/unicode.conf | 4 +- usr.bin/getconf/confstr.gperf | 3 - usr.bin/getconf/getconf.c | 1 + usr.bin/getconf/limits.gperf | 28 +--- usr.bin/getconf/pathconf.gperf | 38 ++---- usr.bin/getconf/progenv.gperf | 11 +- usr.bin/getconf/sysconf.gperf | 42 +----- usr.sbin/nscd/nscd.c | 3 +- usr.sbin/nscd/nscdcli.c | 3 +- 34 files changed, 151 insertions(+), 333 deletions(-) diff --git a/bin/ed/Makefile b/bin/ed/Makefile index b5905e3e5e4e..40e06134e87d 100644 --- a/bin/ed/Makefile +++ b/bin/ed/Makefile @@ -9,7 +9,7 @@ LINKS= ${BINDIR}/ed ${BINDIR}/red MLINKS= ed.1 red.1 .if ${MK_OPENSSL} != "no" && ${MK_ED_CRYPTO} != "no" -CFLAGS+=-DDES -I/usr/include/private/openssl +CFLAGS+=-DDES LIBADD= crypto .endif diff --git a/contrib/dma/mail.c b/contrib/dma/mail.c index 994d1bdd895f..842072c55242 100644 --- a/contrib/dma/mail.c +++ b/contrib/dma/mail.c @@ -38,7 +38,6 @@ #include #include #include -#include #include "dma.h" @@ -342,41 +341,18 @@ newaddr: goto again; } -static int -writeline(struct queue *queue, const char *line, ssize_t linelen) -{ - ssize_t len; - - while (linelen > 0) { - len = linelen; - if (linelen > 1000) { - len = 990; - } - if (fwrite(line, len, 1, queue->mailf) != 1) - return (-1); - if (linelen <= 1000) - break; - if (fwrite("\n", 1, 1, queue->mailf) != 1) - return (-1); - line += 990; - linelen = strlen(line); - } - return (0); -} - int readmail(struct queue *queue, int nodot, int recp_from_header) { struct parse_state parse_state; - char *line = NULL; - ssize_t linelen; - size_t linecap = 0; - char newline[1000]; + char line[1000]; /* by RFC2822 */ + size_t linelen; size_t error; int had_headers = 0; int had_from = 0; int had_messagid = 0; int had_date = 0; + int had_last_line = 0; int nocopy = 0; parse_state.state = NONE; @@ -396,15 +372,24 @@ readmail(struct queue *queue, int nodot, int recp_from_header) return (-1); while (!feof(stdin)) { - newline[0] = '\0'; - if ((linelen = getline(&line, &linecap, stdin)) <= 0) + if (fgets(line, sizeof(line) - 1, stdin) == NULL) break; + if (had_last_line) + errlogx(EX_DATAERR, "bad mail input format:" + " from %s (uid %d) (envelope-from %s)", + username, useruid, queue->sender); + linelen = strlen(line); + if (linelen == 0 || line[linelen - 1] != '\n') { + /* + * This line did not end with a newline character. + * If we fix it, it better be the last line of + * the file. + */ + line[linelen] = '\n'; + line[linelen + 1] = 0; + had_last_line = 1; + } if (!had_headers) { - if (linelen > 1000) - errlogx(EX_DATAERR, "bad mail input format:" - " from %s (uid %d) (envelope-from %s)", - username, useruid, queue->sender); - /* * Unless this is a continuation, switch of * the Bcc: nocopy flag. @@ -440,44 +425,36 @@ readmail(struct queue *queue, int nodot, int recp_from_header) } } - if (line[0] == '\n' && !had_headers) { + if (strcmp(line, "\n") == 0 && !had_headers) { had_headers = 1; while (!had_date || !had_messagid || !had_from) { if (!had_date) { had_date = 1; - snprintf(newline, sizeof(newline), "Date: %s\n", rfc822date()); + snprintf(line, sizeof(line), "Date: %s\n", rfc822date()); } else if (!had_messagid) { /* XXX msgid, assign earlier and log? */ had_messagid = 1; - snprintf(newline, sizeof(newline), "Message-Id: <%"PRIxMAX".%s.%"PRIxMAX"@%s>\n", + snprintf(line, sizeof(line), "Message-Id: <%"PRIxMAX".%s.%"PRIxMAX"@%s>\n", (uintmax_t)time(NULL), queue->id, (uintmax_t)random(), hostname()); } else if (!had_from) { had_from = 1; - snprintf(newline, sizeof(newline), "From: <%s>\n", queue->sender); + snprintf(line, sizeof(line), "From: <%s>\n", queue->sender); } - if (fwrite(newline, strlen(newline), 1, queue->mailf) != 1) - goto fail; + if (fwrite(line, strlen(line), 1, queue->mailf) != 1) + return (-1); } - strlcpy(newline, "\n", sizeof(newline)); + strcpy(line, "\n"); } if (!nodot && linelen == 2 && line[0] == '.') break; if (!nocopy) { - if (newline[0] != '\0') { - if (fwrite(newline, strlen(newline), 1, queue->mailf) != 1) - goto fail; - } else { - if (writeline(queue, line, linelen) != 0) - goto fail; - } + if (fwrite(line, strlen(line), 1, queue->mailf) != 1) + return (-1); } } return (0); -fail: - free(line); - return (-1); } diff --git a/share/mk/bsd.doc.mk b/share/mk/bsd.doc.mk index 64648abb2c5a..5b88ae5d9f0b 100644 --- a/share/mk/bsd.doc.mk +++ b/share/mk/bsd.doc.mk @@ -54,10 +54,10 @@ INDXBIB?= indxbib PIC?= pic REFER?= refer .for _dev in ${PRINTERDEVICE:Mascii} -ROFF.ascii?= nroff -Tascii -P-c ${TRFLAGS} -mtty-char ${MACROS} ${PAGES:C/^/-o/1} +ROFF.ascii?= groff -Tascii -P-c ${TRFLAGS} -mtty-char ${MACROS} ${PAGES:C/^/-o/1} .endfor .for _dev in ${PRINTERDEVICE:Nascii} -ROFF.${_dev}?= nroff -T${_dev} ${TRFLAGS} ${MACROS} ${PAGES:C/^/-o/1} +ROFF.${_dev}?= groff -T${_dev} ${TRFLAGS} ${MACROS} ${PAGES:C/^/-o/1} .endfor SOELIM?= soelim TBL?= tbl diff --git a/sys/amd64/amd64/db_trace.c b/sys/amd64/amd64/db_trace.c index b93c3a839fbd..381237b6b321 100644 --- a/sys/amd64/amd64/db_trace.c +++ b/sys/amd64/amd64/db_trace.c @@ -270,7 +270,6 @@ db_nextframe(struct amd64_frame **fp, db_addr_t *ip, struct thread *td) *fp = (struct amd64_frame *) rbp; } - static int db_backtrace(struct thread *td, struct trapframe *tf, struct amd64_frame *frame, db_addr_t pc, register_t sp, int count) @@ -385,20 +384,6 @@ db_trace_self(void) db_backtrace(curthread, NULL, frame, callpc, 0, -1); } -void -db_trace_self_depth(int depth) -{ - struct amd64_frame *frame; - db_addr_t callpc; - register_t rbp; - - __asm __volatile("movq %%rbp,%0" : "=r" (rbp)); - frame = (struct amd64_frame *)rbp; - callpc = (db_addr_t)db_get_value((long)&frame->f_retaddr, 8, FALSE); - frame = frame->f_frame; - db_backtrace(curthread, NULL, frame, callpc, 0, depth); -} - int db_trace_thread(struct thread *thr, int count) { diff --git a/sys/amd64/cloudabi64/cloudabi64_sysvec.c b/sys/amd64/cloudabi64/cloudabi64_sysvec.c index 71754a7f8aca..060825e79987 100644 --- a/sys/amd64/cloudabi64/cloudabi64_sysvec.c +++ b/sys/amd64/cloudabi64/cloudabi64_sysvec.c @@ -27,7 +27,6 @@ __FBSDID("$FreeBSD$"); #include -#include #include #include #include @@ -39,7 +38,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include diff --git a/sys/cam/ctl/ctl_ioctl.h b/sys/cam/ctl/ctl_ioctl.h index dcabb0fcda14..48ba9b0e70fb 100644 --- a/sys/cam/ctl/ctl_ioctl.h +++ b/sys/cam/ctl/ctl_ioctl.h @@ -150,7 +150,7 @@ struct ctl_lun_io_stats { uint64_t lun_number; uint32_t blocksize; ctl_lun_stats_flags flags; - struct ctl_lun_io_port_stats *ports; + struct ctl_lun_io_port_stats ports[CTL_MAX_PORTS]; }; struct ctl_stats { diff --git a/sys/cddl/dev/fbt/x86/fbt_isa.c b/sys/cddl/dev/fbt/x86/fbt_isa.c index fb0eb2482e60..3f4d8c58ad0d 100644 --- a/sys/cddl/dev/fbt/x86/fbt_isa.c +++ b/sys/cddl/dev/fbt/x86/fbt_isa.c @@ -34,8 +34,6 @@ #include -#include - #include "fbt.h" #define FBT_PUSHL_EBP 0x55 diff --git a/sys/compat/cloudabi/cloudabi_fd.c b/sys/compat/cloudabi/cloudabi_fd.c index 78e6cf0683c2..2f2725ec716d 100644 --- a/sys/compat/cloudabi/cloudabi_fd.c +++ b/sys/compat/cloudabi/cloudabi_fd.c @@ -34,7 +34,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include #include diff --git a/sys/compat/cloudabi64/cloudabi64_poll.c b/sys/compat/cloudabi64/cloudabi64_poll.c index 795163f5c5f6..3df526598934 100644 --- a/sys/compat/cloudabi64/cloudabi64_poll.c +++ b/sys/compat/cloudabi64/cloudabi64_poll.c @@ -27,7 +27,6 @@ __FBSDID("$FreeBSD$"); #include -#include #include #include diff --git a/sys/compat/linuxkpi/common/include/linux/slab.h b/sys/compat/linuxkpi/common/include/linux/slab.h index 91d77deb7fef..d35f7a1ef89a 100644 --- a/sys/compat/linuxkpi/common/include/linux/slab.h +++ b/sys/compat/linuxkpi/common/include/linux/slab.h @@ -72,14 +72,6 @@ struct linux_kmem_cache { }; #define SLAB_HWCACHE_ALIGN 0x0001 -static inline void * -kmalloc_array(size_t n, size_t size, gfp_t flags) -{ - if (size != 0 && n > SIZE_MAX / size) - return (NULL); - return kmalloc(n * size, flags); -} -} static inline int linux_kmem_ctor(void *mem, int size, void *arg, int flags) diff --git a/sys/contrib/dev/acpica/components/namespace/nsxfeval.c b/sys/contrib/dev/acpica/components/namespace/nsxfeval.c index 5bd50db35b7a..363970476d7a 100644 --- a/sys/contrib/dev/acpica/components/namespace/nsxfeval.c +++ b/sys/contrib/dev/acpica/components/namespace/nsxfeval.c @@ -1022,25 +1022,23 @@ ACPI_EXPORT_SYMBOL (AcpiDetachData) /******************************************************************************* * - * FUNCTION: AcpiGetDataFull + * FUNCTION: AcpiGetData * * PARAMETERS: ObjHandle - Namespace node - * Handle - Handler used in call to attach_data + * Handler - Handler used in call to AttachData * Data - Where the data is returned - * Callback - function to execute before returning * * RETURN: Status * - * DESCRIPTION: Retrieve data that was previously attached to a namespace node - * and execute a callback before returning. + * DESCRIPTION: Retrieve data that was previously attached to a namespace node. * ******************************************************************************/ + ACPI_STATUS -AcpiGetDataFull ( +AcpiGetData ( ACPI_HANDLE ObjHandle, ACPI_OBJECT_HANDLER Handler, - void **Data, - void (*Callback)(void *)) + void **Data) { ACPI_NAMESPACE_NODE *Node; ACPI_STATUS Status; @@ -1071,34 +1069,10 @@ AcpiGetDataFull ( } Status = AcpiNsGetAttachedData (Node, Handler, Data); - if (ACPI_SUCCESS(Status) && Callback) { - Callback(*Data); - } + UnlockAndExit: (void) AcpiUtReleaseMutex (ACPI_MTX_NAMESPACE); return (Status); } -ACPI_EXPORT_SYMBOL (AcpiGetDataFull) -/******************************************************************************* - * - * FUNCTION: AcpiGetData - * - * PARAMETERS: ObjHandle - Namespace node - * Handler - Handler used in call to AttachData - * Data - Where the data is returned - * - * RETURN: Status - * - * DESCRIPTION: Retrieve data that was previously attached to a namespace node. - * - ******************************************************************************/ -ACPI_STATUS -AcpiGetData ( - ACPI_HANDLE ObjHandle, - ACPI_OBJECT_HANDLER Handler, - void **Data) -{ - return (AcpiGetDataFull(ObjHandle, Handler, Data, NULL)); -} ACPI_EXPORT_SYMBOL (AcpiGetData) diff --git a/sys/contrib/dev/acpica/include/acpixf.h b/sys/contrib/dev/acpica/include/acpixf.h index 3a1e72068947..ae946711c948 100644 --- a/sys/contrib/dev/acpica/include/acpixf.h +++ b/sys/contrib/dev/acpica/include/acpixf.h @@ -670,14 +670,6 @@ AcpiGetData ( ACPI_OBJECT_HANDLER Handler, void **Data)) -ACPI_EXTERNAL_RETURN_STATUS ( -ACPI_STATUS -AcpiGetDataFull ( - ACPI_HANDLE Object, - ACPI_OBJECT_HANDLER Handler, - void **Data, - void (*Callback)(void *))) - ACPI_EXTERNAL_RETURN_STATUS ( ACPI_STATUS AcpiDebugTrace ( diff --git a/sys/ddb/ddb.h b/sys/ddb/ddb.h index 990b3d502dcc..fcf772b59458 100644 --- a/sys/ddb/ddb.h +++ b/sys/ddb/ddb.h @@ -219,7 +219,6 @@ bool db_stop_at_pc(int type, int code, bool *is_breakpoint, bool *is_watchpoint); #define db_strcpy strcpy void db_trace_self(void); -void db_trace_self_depth(int); int db_trace_thread(struct thread *, int); bool db_value_of_name(const char *name, db_expr_t *valuep); bool db_value_of_name_pcpu(const char *name, db_expr_t *valuep); diff --git a/sys/dev/drm2/drm_agpsupport.c b/sys/dev/drm2/drm_agpsupport.c index 131a9ad9cc91..025350fc4bb7 100644 --- a/sys/dev/drm2/drm_agpsupport.c +++ b/sys/dev/drm2/drm_agpsupport.c @@ -35,6 +35,7 @@ __FBSDID("$FreeBSD$"); #include +#include #if __OS_HAS_AGP @@ -208,15 +209,13 @@ int drm_agp_alloc(struct drm_device *dev, struct drm_agp_buffer *request) if (!dev->agp || !dev->agp->acquired) return -EINVAL; - if (!(entry = malloc(sizeof(*entry), DRM_MEM_AGPLISTS, M_NOWAIT))) + if (!(entry = kzalloc(sizeof(*entry), GFP_KERNEL))) return -ENOMEM; - memset(entry, 0, sizeof(*entry)); - pages = (request->size + PAGE_SIZE - 1) / PAGE_SIZE; type = (u32) request->type; if (!(memory = agp_alloc_memory(dev->agp->bridge, type, pages << PAGE_SHIFT))) { - free(entry, DRM_MEM_AGPLISTS); + kfree(entry); return -ENOMEM; } @@ -376,7 +375,7 @@ int drm_agp_free(struct drm_device *dev, struct drm_agp_buffer *request) list_del(&entry->head); drm_free_agp(entry->memory, entry->pages); - free(entry, DRM_MEM_AGPLISTS); + kfree(entry); return 0; } EXPORT_SYMBOL(drm_agp_free); @@ -404,12 +403,11 @@ struct drm_agp_head *drm_agp_init(struct drm_device *dev) { struct drm_agp_head *head = NULL; - if (!(head = malloc(sizeof(*head), DRM_MEM_AGPLISTS, M_NOWAIT))) + if (!(head = kzalloc(sizeof(*head), GFP_KERNEL))) return NULL; - memset((void *)head, 0, sizeof(*head)); head->bridge = agp_find_device(); if (!head->bridge) { - free(head, DRM_MEM_AGPLISTS); + kfree(head); return NULL; } else { agp_get_info(head->bridge, &head->agp_info); diff --git a/sys/dev/drm2/drm_bufs.c b/sys/dev/drm2/drm_bufs.c index 488a6be310d9..483ee55e06d1 100644 --- a/sys/dev/drm2/drm_bufs.c +++ b/sys/dev/drm2/drm_bufs.c @@ -39,9 +39,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include -#include - #include #include @@ -219,7 +216,7 @@ static int drm_addmap_core(struct drm_device * dev, resource_size_t offset, int ret; int align; - map = kmalloc(sizeof(*map), GFP_KERNEL); + map = malloc(sizeof(*map), DRM_MEM_MAPS, M_NOWAIT); if (!map) return -ENOMEM; @@ -233,7 +230,7 @@ static int drm_addmap_core(struct drm_device * dev, resource_size_t offset, * when processes fork. */ if ((map->flags & _DRM_REMOVABLE) && map->type != _DRM_SHM) { - kfree(map); + free(map, DRM_MEM_MAPS); return -EINVAL; } DRM_DEBUG("offset = 0x%08llx, size = 0x%08lx, type = %d\n", @@ -252,7 +249,7 @@ static int drm_addmap_core(struct drm_device * dev, resource_size_t offset, * constant. */ if ((map->offset & ((resource_size_t)PAGE_MASK)) || (map->size & (PAGE_MASK))) { - kfree(map); + free(map, DRM_MEM_MAPS); return -EINVAL; } map->mtrr = -1; @@ -284,7 +281,7 @@ static int drm_addmap_core(struct drm_device * dev, resource_size_t offset, list->map->size = map->size; } - kfree(map); + free(map, DRM_MEM_MAPS); *maplist = list; return 0; } @@ -301,7 +298,7 @@ static int drm_addmap_core(struct drm_device * dev, resource_size_t offset, if (map->type == _DRM_REGISTERS) { drm_core_ioremap(map, dev); if (!map->handle) { - kfree(map); + free(map, DRM_MEM_MAPS); return -ENOMEM; } } @@ -317,23 +314,23 @@ static int drm_addmap_core(struct drm_device * dev, resource_size_t offset, list->map->size = map->size; } - kfree(map); + free(map, DRM_MEM_MAPS); *maplist = list; return 0; } - map->handle = vmalloc_user(map->size); + map->handle = malloc(map->size, DRM_MEM_MAPS, M_NOWAIT); DRM_DEBUG("%lu %d %p\n", map->size, drm_order(map->size), map->handle); if (!map->handle) { - kfree(map); + free(map, DRM_MEM_MAPS); return -ENOMEM; } map->offset = (unsigned long)map->handle; if (map->flags & _DRM_CONTAINS_LOCK) { /* Prevent a 2nd X Server from creating a 2nd lock */ if (dev->primary->master->lock.hw_lock != NULL) { - kfree(map->handle); - kfree(map); + free(map->handle, DRM_MEM_MAPS); + free(map, DRM_MEM_MAPS); return -EBUSY; } dev->sigdata.lock = dev->primary->master->lock.hw_lock = map->handle; /* Pointer to lock */ @@ -344,7 +341,7 @@ static int drm_addmap_core(struct drm_device * dev, resource_size_t offset, int valid = 0; if (!drm_core_has_AGP(dev)) { - kfree(map); + free(map, DRM_MEM_MAPS); return -EINVAL; } #ifdef __linux__ @@ -379,7 +376,7 @@ static int drm_addmap_core(struct drm_device * dev, resource_size_t offset, } } if (!list_empty(&dev->agp->memory) && !valid) { - kfree(map); + free(map, DRM_MEM_MAPS); return -EPERM; } DRM_DEBUG("AGP offset = 0x%08llx, size = 0x%08lx\n", @@ -392,7 +389,7 @@ static int drm_addmap_core(struct drm_device * dev, resource_size_t offset, break; case _DRM_SCATTER_GATHER: if (!dev->sg) { - kfree(map); + free(map, DRM_MEM_MAPS); return -EINVAL; } map->handle = (void *)(dev->sg->vaddr + offset); @@ -408,7 +405,7 @@ static int drm_addmap_core(struct drm_device * dev, resource_size_t offset, align = PAGE_SIZE; dmah = drm_pci_alloc(dev, map->size, align, BUS_SPACE_MAXADDR); if (!dmah) { - kfree(map); + free(map, DRM_MEM_MAPS); return -ENOMEM; } map->handle = dmah->vaddr; @@ -416,15 +413,15 @@ static int drm_addmap_core(struct drm_device * dev, resource_size_t offset, map->dmah = dmah; break; default: - kfree(map); + free(map, DRM_MEM_MAPS); return -EINVAL; } - list = kzalloc(sizeof(*list), GFP_KERNEL); + list = malloc(sizeof(*list), DRM_MEM_MAPS, M_ZERO | M_NOWAIT); if (!list) { if (map->type == _DRM_REGISTERS) drm_core_ioremapfree(map, dev); - kfree(map); + free(map, DRM_MEM_MAPS); return -EINVAL; } list->map = map; @@ -441,8 +438,8 @@ static int drm_addmap_core(struct drm_device * dev, resource_size_t offset, if (ret) { if (map->type == _DRM_REGISTERS) drm_core_ioremapfree(map, dev); - kfree(map); - kfree(list); + free(map, DRM_MEM_MAPS); + free(list, DRM_MEM_MAPS); DRM_UNLOCK(dev); return ret; } @@ -526,7 +523,7 @@ int drm_rmmap_locked(struct drm_device *dev, struct drm_local_map *map) list_del(&r_list->head); drm_ht_remove_key(&dev->map_hash, r_list->user_token >> PAGE_SHIFT); - kfree(r_list); + free(r_list, DRM_MEM_MAPS); found = 1; break; } @@ -548,7 +545,7 @@ int drm_rmmap_locked(struct drm_device *dev, struct drm_local_map *map) } break; case _DRM_SHM: - kfree(map->handle); + free(map->handle, DRM_MEM_MAPS); if (master) { if (dev->sigdata.lock == master->lock.hw_lock) dev->sigdata.lock = NULL; @@ -567,7 +564,7 @@ int drm_rmmap_locked(struct drm_device *dev, struct drm_local_map *map) DRM_ERROR("tried to rmmap GEM object\n"); break; } - kfree(map); + free(map, DRM_MEM_MAPS); return 0; } @@ -658,16 +655,16 @@ static void drm_cleanup_buf_error(struct drm_device * dev, drm_pci_free(dev, entry->seglist[i]); } } - kfree(entry->seglist); + free(entry->seglist, DRM_MEM_SEGS); entry->seg_count = 0; } if (entry->buf_count) { for (i = 0; i < entry->buf_count; i++) { - kfree(entry->buflist[i].dev_private); + free(entry->buflist[i].dev_private, DRM_MEM_BUFS); } - kfree(entry->buflist); + free(entry->buflist, DRM_MEM_BUFS); entry->buf_count = 0; } @@ -764,7 +761,8 @@ int drm_addbufs_agp(struct drm_device * dev, struct drm_buf_desc * request) return -EINVAL; } - entry->buflist = kcalloc(count, sizeof(*entry->buflist), GFP_KERNEL); + entry->buflist = malloc(count * sizeof(*entry->buflist), DRM_MEM_BUFS, + M_NOWAIT | M_ZERO); if (!entry->buflist) { DRM_UNLOCK(dev); atomic_dec(&dev->buf_alloc); @@ -792,7 +790,8 @@ int drm_addbufs_agp(struct drm_device * dev, struct drm_buf_desc * request) buf->file_priv = NULL; buf->dev_priv_size = dev->driver->dev_priv_size; - buf->dev_private = kzalloc(buf->dev_priv_size, GFP_KERNEL); + buf->dev_private = malloc(buf->dev_priv_size, DRM_MEM_BUFS, + M_NOWAIT | M_ZERO); if (!buf->dev_private) { /* Set count correctly so we free the proper amount. */ entry->buf_count = count; @@ -811,8 +810,9 @@ int drm_addbufs_agp(struct drm_device * dev, struct drm_buf_desc * request) DRM_DEBUG("byte_count: %d\n", byte_count); - temp_buflist = krealloc(dma->buflist, - (dma->buf_count + entry->buf_count) * sizeof(*dma->buflist), GFP_KERNEL); + temp_buflist = realloc(dma->buflist, + (dma->buf_count + entry->buf_count) * sizeof(*dma->buflist), + DRM_MEM_BUFS, M_NOWAIT); if (!temp_buflist) { /* Free the entry because it isn't valid */ drm_cleanup_buf_error(dev, entry); @@ -912,16 +912,18 @@ int drm_addbufs_pci(struct drm_device * dev, struct drm_buf_desc * request) return -EINVAL; } - entry->buflist = kcalloc(count, sizeof(*entry->buflist), GFP_KERNEL); + entry->buflist = malloc(count * sizeof(*entry->buflist), DRM_MEM_BUFS, + M_NOWAIT | M_ZERO); if (!entry->buflist) { DRM_UNLOCK(dev); atomic_dec(&dev->buf_alloc); return -ENOMEM; } - entry->seglist = kcalloc(count, sizeof(*entry->seglist), GFP_KERNEL); + entry->seglist = malloc(count * sizeof(*entry->seglist), DRM_MEM_SEGS, + M_NOWAIT | M_ZERO); if (!entry->seglist) { - kfree(entry->buflist); + free(entry->buflist, DRM_MEM_BUFS); DRM_UNLOCK(dev); atomic_dec(&dev->buf_alloc); return -ENOMEM; @@ -930,12 +932,11 @@ int drm_addbufs_pci(struct drm_device * dev, struct drm_buf_desc * request) /* Keep the original pagelist until we know all the allocations * have succeeded */ - temp_pagelist = kmalloc_array(dma->page_count + (count << page_order), - sizeof(*dma->pagelist), - GFP_KERNEL); + temp_pagelist = malloc((dma->page_count + (count << page_order)) * + sizeof(*dma->pagelist), DRM_MEM_PAGES, M_NOWAIT); if (!temp_pagelist) { - kfree(entry->buflist); - kfree(entry->seglist); + free(entry->buflist, DRM_MEM_BUFS); + free(entry->seglist, DRM_MEM_SEGS); DRM_UNLOCK(dev); atomic_dec(&dev->buf_alloc); return -ENOMEM; @@ -959,7 +960,7 @@ int drm_addbufs_pci(struct drm_device * dev, struct drm_buf_desc * request) entry->buf_count = count; entry->seg_count = count; drm_cleanup_buf_error(dev, entry); - kfree(temp_pagelist); + free(temp_pagelist, DRM_MEM_PAGES); DRM_UNLOCK(dev); atomic_dec(&dev->buf_alloc); return -ENOMEM; @@ -989,14 +990,14 @@ int drm_addbufs_pci(struct drm_device * dev, struct drm_buf_desc * request) buf->file_priv = NULL; buf->dev_priv_size = dev->driver->dev_priv_size; - buf->dev_private = kzalloc(buf->dev_priv_size, - GFP_KERNEL); + buf->dev_private = malloc(buf->dev_priv_size, + DRM_MEM_BUFS, M_NOWAIT | M_ZERO); if (!buf->dev_private) { /* Set count correctly so we free the proper amount. */ entry->buf_count = count; entry->seg_count = count; drm_cleanup_buf_error(dev, entry); - kfree(temp_pagelist); + free(temp_pagelist, DRM_MEM_PAGES); DRM_UNLOCK(dev); atomic_dec(&dev->buf_alloc); return -ENOMEM; @@ -1008,13 +1009,13 @@ int drm_addbufs_pci(struct drm_device * dev, struct drm_buf_desc * request) byte_count += PAGE_SIZE << page_order; } - temp_buflist = krealloc(dma->buflist, - (dma->buf_count + entry->buf_count) * - sizeof(*dma->buflist), GFP_KERNEL); + temp_buflist = realloc(dma->buflist, + (dma->buf_count + entry->buf_count) * sizeof(*dma->buflist), + DRM_MEM_BUFS, M_NOWAIT); if (!temp_buflist) { /* Free the entry because it isn't valid */ drm_cleanup_buf_error(dev, entry); - kfree(temp_pagelist); + free(temp_pagelist, DRM_MEM_PAGES); DRM_UNLOCK(dev); atomic_dec(&dev->buf_alloc); return -ENOMEM; @@ -1029,7 +1030,7 @@ int drm_addbufs_pci(struct drm_device * dev, struct drm_buf_desc * request) * with the new one. */ if (dma->page_count) { - kfree(dma->pagelist); + free(dma->pagelist, DRM_MEM_PAGES); } dma->pagelist = temp_pagelist; @@ -1123,7 +1124,8 @@ static int drm_addbufs_sg(struct drm_device * dev, struct drm_buf_desc * request return -EINVAL; } - entry->buflist = kcalloc(count, sizeof(*entry->buflist), GFP_KERNEL); + entry->buflist = malloc(count * sizeof(*entry->buflist), DRM_MEM_BUFS, + M_NOWAIT | M_ZERO); if (!entry->buflist) { DRM_UNLOCK(dev); atomic_dec(&dev->buf_alloc); @@ -1152,7 +1154,8 @@ static int drm_addbufs_sg(struct drm_device * dev, struct drm_buf_desc * request buf->file_priv = NULL; buf->dev_priv_size = dev->driver->dev_priv_size; - buf->dev_private = kzalloc(buf->dev_priv_size, GFP_KERNEL); + buf->dev_private = malloc(buf->dev_priv_size, DRM_MEM_BUFS, + M_NOWAIT | M_ZERO); if (!buf->dev_private) { /* Set count correctly so we free the proper amount. */ entry->buf_count = count; @@ -1171,9 +1174,9 @@ static int drm_addbufs_sg(struct drm_device * dev, struct drm_buf_desc * request DRM_DEBUG("byte_count: %d\n", byte_count); - temp_buflist = krealloc(dma->buflist, - (dma->buf_count + entry->buf_count) * - sizeof(*dma->buflist), GFP_KERNEL); + temp_buflist = realloc(dma->buflist, + (dma->buf_count + entry->buf_count) * sizeof(*dma->buflist), + DRM_MEM_BUFS, M_NOWAIT); if (!temp_buflist) { /* Free the entry because it isn't valid */ drm_cleanup_buf_error(dev, entry); @@ -1277,7 +1280,8 @@ static int drm_addbufs_fb(struct drm_device * dev, struct drm_buf_desc * request return -EINVAL; } - entry->buflist = kzalloc(count * sizeof(*entry->buflist), GFP_KERNEL); + entry->buflist = malloc(count * sizeof(*entry->buflist), DRM_MEM_BUFS, + M_NOWAIT | M_ZERO); if (!entry->buflist) { DRM_UNLOCK(dev); atomic_dec(&dev->buf_alloc); @@ -1305,7 +1309,8 @@ static int drm_addbufs_fb(struct drm_device * dev, struct drm_buf_desc * request buf->file_priv = NULL; buf->dev_priv_size = dev->driver->dev_priv_size; - buf->dev_private = kmalloc(buf->dev_priv_size, GFP_KERNEL); + buf->dev_private = malloc(buf->dev_priv_size, DRM_MEM_BUFS, + M_NOWAIT | M_ZERO); if (!buf->dev_private) { /* Set count correctly so we free the proper amount. */ entry->buf_count = count; @@ -1324,8 +1329,9 @@ static int drm_addbufs_fb(struct drm_device * dev, struct drm_buf_desc * request DRM_DEBUG("byte_count: %d\n", byte_count); - temp_buflist = krealloc(dma->buflist, - (dma->buf_count + entry->buf_count) * sizeof(*dma->buflist), GFP_KERNEL); + temp_buflist = realloc(dma->buflist, + (dma->buf_count + entry->buf_count) * sizeof(*dma->buflist), + DRM_MEM_BUFS, M_NOWAIT); if (!temp_buflist) { /* Free the entry because it isn't valid */ drm_cleanup_buf_error(dev, entry); diff --git a/sys/dev/drm2/drm_dma.c b/sys/dev/drm2/drm_dma.c index 9ce6e3e9693e..380be2b8ca31 100644 --- a/sys/dev/drm2/drm_dma.c +++ b/sys/dev/drm2/drm_dma.c @@ -37,7 +37,6 @@ __FBSDID("$FreeBSD$"); #include -#include /** * Initialize the DMA data. @@ -90,17 +89,18 @@ void drm_dma_takedown(struct drm_device *dev) drm_pci_free(dev, dma->bufs[i].seglist[j]); } } - kfree(dma->bufs[i].seglist); + free(dma->bufs[i].seglist, DRM_MEM_SEGS); } if (dma->bufs[i].buf_count) { for (j = 0; j < dma->bufs[i].buf_count; j++) { - kfree(dma->bufs[i].buflist[j].dev_private); + free(dma->bufs[i].buflist[j].dev_private, + DRM_MEM_BUFS); } - kfree(dma->bufs[i].buflist); + free(dma->bufs[i].buflist, DRM_MEM_BUFS); } } - kfree(dma->buflist); + free(dma->buflist, DRM_MEM_BUFS); free(dma->pagelist, DRM_MEM_PAGES); free(dev->dma, DRM_MEM_DRIVER); dev->dma = NULL; diff --git a/sys/dev/drm2/drm_drv.c b/sys/dev/drm2/drm_drv.c index 9529ac3dfa4b..c220668bdb71 100644 --- a/sys/dev/drm2/drm_drv.c +++ b/sys/dev/drm2/drm_drv.c @@ -51,6 +51,7 @@ __FBSDID("$FreeBSD$"); #include +#include #include #include #include @@ -211,7 +212,7 @@ int drm_lastclose(struct drm_device * dev) if (entry->bound) drm_unbind_agp(entry->memory); drm_free_agp(entry->memory, entry->pages); - free(entry, DRM_MEM_AGPLISTS); + kfree(entry); } INIT_LIST_HEAD(&dev->agp->memory); diff --git a/sys/dev/drm2/drm_os_freebsd.c b/sys/dev/drm2/drm_os_freebsd.c index 854cc54a8ad4..90d7319a2ea0 100644 --- a/sys/dev/drm2/drm_os_freebsd.c +++ b/sys/dev/drm2/drm_os_freebsd.c @@ -16,6 +16,7 @@ MALLOC_DEFINE(DRM_MEM_MAGIC, "drm_magic", "DRM MAGIC Data Structures"); MALLOC_DEFINE(DRM_MEM_MINOR, "drm_minor", "DRM MINOR Data Structures"); MALLOC_DEFINE(DRM_MEM_IOCTLS, "drm_ioctls", "DRM IOCTL Data Structures"); MALLOC_DEFINE(DRM_MEM_MAPS, "drm_maps", "DRM MAP Data Structures"); +MALLOC_DEFINE(DRM_MEM_BUFS, "drm_bufs", "DRM BUFFER Data Structures"); MALLOC_DEFINE(DRM_MEM_SEGS, "drm_segs", "DRM SEGMENTS Data Structures"); MALLOC_DEFINE(DRM_MEM_PAGES, "drm_pages", "DRM PAGES Data Structures"); MALLOC_DEFINE(DRM_MEM_FILES, "drm_files", "DRM FILE Data Structures"); @@ -23,7 +24,6 @@ MALLOC_DEFINE(DRM_MEM_QUEUES, "drm_queues", "DRM QUEUE Data Structures"); MALLOC_DEFINE(DRM_MEM_CMDS, "drm_cmds", "DRM COMMAND Data Structures"); MALLOC_DEFINE(DRM_MEM_MAPPINGS, "drm_mapping", "DRM MAPPING Data Structures"); MALLOC_DEFINE(DRM_MEM_BUFLISTS, "drm_buflists", "DRM BUFLISTS Data Structures"); -MALLOC_DEFINE(DRM_MEM_AGPLISTS, "drm_agplists", "DRM AGPLISTS Data Structures"); MALLOC_DEFINE(DRM_MEM_CTXBITMAP, "drm_ctxbitmap", "DRM CTXBITMAP Data Structures"); MALLOC_DEFINE(DRM_MEM_SGLISTS, "drm_sglists", "DRM SGLISTS Data Structures"); @@ -495,4 +495,5 @@ MODULE_VERSION(drmn, 1); MODULE_DEPEND(drmn, agp, 1, 1, 1); MODULE_DEPEND(drmn, pci, 1, 1, 1); MODULE_DEPEND(drmn, mem, 1, 1, 1); +MODULE_DEPEND(drmn, linuxkpi, 1, 1, 1); MODULE_DEPEND(drmn, iicbus, 1, 1, 1); diff --git a/sys/dev/drm2/drm_os_freebsd.h b/sys/dev/drm2/drm_os_freebsd.h index 05fc921906bb..cedc7a25228d 100644 --- a/sys/dev/drm2/drm_os_freebsd.h +++ b/sys/dev/drm2/drm_os_freebsd.h @@ -544,6 +544,7 @@ MALLOC_DECLARE(DRM_MEM_MAGIC); MALLOC_DECLARE(DRM_MEM_MINOR); MALLOC_DECLARE(DRM_MEM_IOCTLS); MALLOC_DECLARE(DRM_MEM_MAPS); +MALLOC_DECLARE(DRM_MEM_BUFS); MALLOC_DECLARE(DRM_MEM_SEGS); MALLOC_DECLARE(DRM_MEM_PAGES); MALLOC_DECLARE(DRM_MEM_FILES); @@ -551,7 +552,6 @@ MALLOC_DECLARE(DRM_MEM_QUEUES); MALLOC_DECLARE(DRM_MEM_CMDS); MALLOC_DECLARE(DRM_MEM_MAPPINGS); MALLOC_DECLARE(DRM_MEM_BUFLISTS); -MALLOC_DECLARE(DRM_MEM_AGPLISTS); MALLOC_DECLARE(DRM_MEM_CTXBITMAP); MALLOC_DECLARE(DRM_MEM_SGLISTS); MALLOC_DECLARE(DRM_MEM_MM); diff --git a/sys/dev/drm2/drm_stub.c b/sys/dev/drm2/drm_stub.c index 06663ac8ef70..54b1a80cb7a1 100644 --- a/sys/dev/drm2/drm_stub.c +++ b/sys/dev/drm2/drm_stub.c @@ -36,6 +36,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #ifdef DRM_DEBUG_DEFAULT_ON unsigned int drm_debug = (DRM_DEBUGBITS_DEBUG | DRM_DEBUGBITS_KMS | @@ -315,7 +316,7 @@ void drm_cancel_fill_in_dev(struct drm_device *dev) DRM_MTRR_WC); DRM_DEBUG("mtrr_del=%d\n", retval); } - free(dev->agp, DRM_MEM_AGPLISTS); + kfree(dev->agp); dev->agp = NULL; drm_ht_remove(&dev->map_hash); @@ -467,7 +468,7 @@ void drm_put_dev(struct drm_device *dev) drm_sysctl_cleanup(dev); if (drm_core_has_AGP(dev) && dev->agp) { - free(dev->agp, DRM_MEM_AGPLISTS); + kfree(dev->agp); dev->agp = NULL; } diff --git a/sys/fs/nfsserver/nfs_nfsdstate.c b/sys/fs/nfsserver/nfs_nfsdstate.c index d4c5fd11b718..1c2e7d1a762e 100644 --- a/sys/fs/nfsserver/nfs_nfsdstate.c +++ b/sys/fs/nfsserver/nfs_nfsdstate.c @@ -3081,7 +3081,7 @@ tryagain: new_deleg->ls_stateid.other[2] = delegstateidp->other[2] = nfsrv_nextstateindex(clp); if (writedeleg && !NFSVNO_EXRDONLY(exp) && - (nfsrv_writedelegifpos && !readonly) && + (nfsrv_writedelegifpos || !readonly) && (new_stp->ls_flags & NFSLCK_WANTRDELEG) == 0) { new_deleg->ls_flags = (NFSLCK_DELEGWRITE | NFSLCK_READACCESS | NFSLCK_WRITEACCESS); @@ -3153,7 +3153,7 @@ tryagain: delegstateidp->other[2] = nfsrv_nextstateindex(clp); if (writedeleg && !NFSVNO_EXRDONLY(exp) && - (nfsrv_writedelegifpos && !readonly) && + (nfsrv_writedelegifpos || !readonly) && ((nd->nd_flag & ND_NFSV41) == 0 || (new_stp->ls_flags & NFSLCK_WANTRDELEG) == 0)) { diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index 51e716c30218..fd6c796da14d 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -69,7 +69,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include #include @@ -4075,13 +4074,6 @@ invfo_sendfile(struct file *fp, int sockfd, struct uio *hdr_uio, return (EINVAL); } -bool -fd_modified(struct filedesc *fdp, int fd, uint32_t seq) -{ - - return (!seq_consistent(fd_seq(fdp->fd_files, fd), seq)); -} - /*-------------------------------------------------------------------*/ /* diff --git a/sys/kern/kern_shutdown.c b/sys/kern/kern_shutdown.c index 161548be272c..370a5447be4d 100644 --- a/sys/kern/kern_shutdown.c +++ b/sys/kern/kern_shutdown.c @@ -722,14 +722,6 @@ vpanic(const char *fmt, va_list ap) spinlock_enter(); -#if 0 -/***** DEBUGGING DRM *****/ - - doadump(0); - EVENTHANDLER_INVOKE(shutdown_final, RB_NOSYNC); - -/************************/ -#endif #ifdef SMP /* * stop_cpus_hard(other_cpus) should prevent multiple CPUs from diff --git a/sys/modules/drm2/drm2/Makefile b/sys/modules/drm2/drm2/Makefile index 35bee2972091..75696466db6d 100644 --- a/sys/modules/drm2/drm2/Makefile +++ b/sys/modules/drm2/drm2/Makefile @@ -48,6 +48,8 @@ SRCS = \ ati_pcigart.c #ttm_page_alloc_dma.c +CFLAGS+= -I${.CURDIR}/../../../compat/linuxkpi/common/include + .if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_ARCH} == "powerpc64" SRCS += drm_ioc32.c .endif diff --git a/tools/build/Makefile b/tools/build/Makefile index 0368021e3457..63b147ceb985 100644 --- a/tools/build/Makefile +++ b/tools/build/Makefile @@ -41,11 +41,6 @@ SYSINCS+= stat.h SRCS+= futimens.c utimensat.c .endif -.if !exists(/usr/include/capsicum_helpers.h) -.PATH: ${.CURDIR}/../../lib/libcapsicum/ -INCS+= capsicum_helpers.h -.endif - .if empty(SRCS) SRCS= dummy.c .endif diff --git a/tools/tools/locale/etc/unicode.conf b/tools/tools/locale/etc/unicode.conf index 42a216cdeb10..8d5e4e104d01 100644 --- a/tools/tools/locale/etc/unicode.conf +++ b/tools/tools/locale/etc/unicode.conf @@ -1,4 +1,4 @@ # $FreeBSD$ -cldr /home/bapt/unicode/cldr/30.0.3 -unidata /home/bapt/unicode/UNIDATA/9.0.0 +cldr ~/unicode/cldr/30.0.3 +unidata ~/unicode/UNIDATA/9.0.0 diff --git a/usr.bin/getconf/confstr.gperf b/usr.bin/getconf/confstr.gperf index 11434ba29e96..c629987e5caf 100644 --- a/usr.bin/getconf/confstr.gperf +++ b/usr.bin/getconf/confstr.gperf @@ -52,9 +52,6 @@ _POSIX_V6_LPBIG_OFFBIG_CFLAGS, _CS_POSIX_V6_LPBIG_OFFBIG_CFLAGS _POSIX_V6_LPBIG_OFFBIG_LDFLAGS, _CS_POSIX_V6_LPBIG_OFFBIG_LDFLAGS _POSIX_V6_LPBIG_OFFBIG_LIBS, _CS_POSIX_V6_LPBIG_OFFBIG_LIBS _POSIX_V6_WIDTH_RESTRICTED_ENVS, _CS_POSIX_V6_WIDTH_RESTRICTED_ENVS -DARWIN_USER_DIR, _CS_DARWIN_USER_DIR -DARWIN_USER_TEMP_DIR, _CS_DARWIN_USER_TEMP_DIR -DARWIN_USER_CACHE_DIR, _CS_DARWIN_USER_CACHE_DIR %% int find_confstr(const char *name, int *key) diff --git a/usr.bin/getconf/getconf.c b/usr.bin/getconf/getconf.c index 5da036c2e6d5..a82196e33d2e 100644 --- a/usr.bin/getconf/getconf.c +++ b/usr.bin/getconf/getconf.c @@ -187,3 +187,4 @@ do_pathconf(const char *name, int key, const char *path) else printf("%ld\n", value); } + diff --git a/usr.bin/getconf/limits.gperf b/usr.bin/getconf/limits.gperf index a944191c810b..68e0d65e78ff 100644 --- a/usr.bin/getconf/limits.gperf +++ b/usr.bin/getconf/limits.gperf @@ -9,9 +9,6 @@ #include #include -#ifdef APPLE_GETCONF_UNDERSCORE -#include -#endif /* APPLE_GETCONF_UNDERSCORE */ #include "getconf.h" @@ -23,11 +20,11 @@ static const struct map *in_word_set(const char *str); %} struct map { const char *name; intmax_t value; int valid; }; %% +_POSIX_CLOCKRES_MIN, _POSIX_CLOCKRES_MIN _POSIX_AIO_LISTIO_MAX, _POSIX_AIO_LISTIO_MAX _POSIX_AIO_MAX, _POSIX_AIO_MAX _POSIX_ARG_MAX, _POSIX_ARG_MAX _POSIX_CHILD_MAX, _POSIX_CHILD_MAX -_POSIX_CLOCKRES_MIN, _POSIX_CLOCKRES_MIN _POSIX_DELAYTIMER_MAX, _POSIX_DELAYTIMER_MAX _POSIX_HOST_NAME_MAX, _POSIX_HOST_NAME_MAX _POSIX_LINK_MAX, _POSIX_LINK_MAX @@ -67,7 +64,7 @@ _POSIX2_BC_SCALE_MAX, _POSIX2_BC_SCALE_MAX _POSIX2_BC_STRING_MAX, _POSIX2_BC_STRING_MAX _POSIX2_CHARCLASS_NAME_MAX, _POSIX2_CHARCLASS_NAME_MAX _POSIX2_COLL_WEIGHTS_MAX, _POSIX2_COLL_WEIGHTS_MAX -_POSIX2_EXPR_NEST_MAX, _POSIX2_EXPR_NEST_MAX +_POSIX2_EXPR_NEXT_MAX, _POSIX2_EXPR_NEST_MAX _POSIX2_LINE_MAX, _POSIX2_LINE_MAX _POSIX2_RE_DUP_MAX, _POSIX2_RE_DUP_MAX _XOPEN_IOV_MAX, _XOPEN_IOV_MAX @@ -108,9 +105,6 @@ int find_limit(const char *name, intmax_t *value) { const struct map *rv; -#ifdef APPLE_GETCONF_UNDERSCORE - char *alt; -#endif /* APPLE_GETCONF_UNDERSCORE */ rv = in_word_set(name); if (rv != NULL) { @@ -120,23 +114,5 @@ find_limit(const char *name, intmax_t *value) } return -1; } -#ifdef APPLE_GETCONF_UNDERSCORE - if(*name == '_') - alt = (char *)name + 1; - else { - if((alt = (char *)alloca(strlen(name) + 2)) == NULL) - return 0; - *alt = '_'; - strcpy(alt + 1, name); - } - rv = in_word_set(alt); - if (rv != NULL) { - if (rv->valid) { - *value = rv->value; - return 1; - } - return -1; - } -#endif /* APPLE_GETCONF_UNDERSCORE */ return 0; } diff --git a/usr.bin/getconf/pathconf.gperf b/usr.bin/getconf/pathconf.gperf index 3b9e0f478364..f283546f063a 100644 --- a/usr.bin/getconf/pathconf.gperf +++ b/usr.bin/getconf/pathconf.gperf @@ -9,9 +9,6 @@ #include #include -#ifdef APPLE_GETCONF_UNDERSCORE -#include -#endif /* APPLE_GETCONF_UNDERSCORE */ #include "getconf.h" @@ -23,10 +20,17 @@ static const struct map *in_word_set(const char *str); %} struct map { const char *name; int key; int valid; }; %% +ACL_EXTENDED, _PC_ACL_EXTENDED +ACL_NFS4, _PC_ACL_NFS4 +ACL_PATH_MAX, _PC_ACL_PATH_MAX +CAP_PRESENT, _PC_CAP_PRESENT FILESIZEBITS, _PC_FILESIZEBITS +INF_PRESENT, _PC_INF_PRESENT LINK_MAX, _PC_LINK_MAX +MAC_PRESENT, _PC_MAC_PRESENT MAX_CANON, _PC_MAX_CANON MAX_INPUT, _PC_MAX_INPUT +MIN_HOLE_SIZE, _PC_MIN_HOLE_SIZE NAME_MAX, _PC_NAME_MAX PATH_MAX, _PC_PATH_MAX PIPE_BUF, _PC_PIPE_BUF @@ -35,28 +39,24 @@ POSIX_REC_INCR_XFER_SIZE, _PC_REC_INCR_XFER_SIZE POSIX_REC_MAX_XFER_SIZE, _PC_REC_MAX_XFER_SIZE POSIX_REC_MIN_XFER_SIZE, _PC_REC_MIN_XFER_SIZE POSIX_REC_XFER_ALIGN, _PC_REC_XFER_ALIGN -POSIX2_SYMLINKS, _PC_2_SYMLINKS SYMLINK_MAX, _PC_SYMLINK_MAX TRUSTEDBSD_ACL_EXTENDED, _PC_ACL_EXTENDED +TRUSTEDBSD_ACL_NFS4, _PC_ACL_NFS4 TRUSTEDBSD_ACL_PATH_MAX, _PC_ACL_PATH_MAX TRUSTEDBSD_CAP_PRESENT, _PC_CAP_PRESENT TRUSTEDBSD_INF_PRESENT, _PC_INF_PRESENT TRUSTEDBSD_MAC_PRESENT, _PC_MAC_PRESENT -_POSIX_ASYNC_IO, _PC_ASYNC_IO _POSIX_CHOWN_RESTRICTED, _PC_CHOWN_RESTRICTED _POSIX_NO_TRUNC, _PC_NO_TRUNC -_POSIX_PATH_MAX, _PC_PATH_MAX +_POSIX_VDISABLE, _PC_VDISABLE +_POSIX_ASYNC_IO, _PC_ASYNC_IO _POSIX_PRIO_IO, _PC_PRIO_IO _POSIX_SYNC_IO, _PC_SYNC_IO -_POSIX_VDISABLE, _PC_VDISABLE %% int find_pathconf(const char *name, int *key) { const struct map *rv; -#ifdef APPLE_GETCONF_UNDERSCORE - char *alt; -#endif /* APPLE_GETCONF_UNDERSCORE */ rv = in_word_set(name); if (rv != NULL) { @@ -66,23 +66,5 @@ find_pathconf(const char *name, int *key) } return -1; } -#ifdef APPLE_GETCONF_UNDERSCORE - if(*name == '_') - alt = (char *)name + 1; - else { - if((alt = (char *)alloca(strlen(name) + 2)) == NULL) - return 0; - *alt = '_'; - strcpy(alt + 1, name); - } - rv = in_word_set(alt); - if (rv != NULL) { - if (rv->valid) { - *key = rv->key; - return 1; - } - return -1; - } -#endif /* APPLE_GETCONF_UNDERSCORE */ return 0; } diff --git a/usr.bin/getconf/progenv.gperf b/usr.bin/getconf/progenv.gperf index 564c7d944775..481055393b79 100644 --- a/usr.bin/getconf/progenv.gperf +++ b/usr.bin/getconf/progenv.gperf @@ -30,14 +30,11 @@ static const struct map *in_word_set(const char *str); * be updated. (We cheat here and define the supported environments * statically.) */ -#if defined(__alpha__) || defined(__sparc64__) +#if defined(__sparc64__) || defined(__amd64__) #define have_LP64_OFF64 NULL -#elif defined(__APPLE__) -#define have_LP64_OFF64 NULL -#define have_LPBIG_OFFBIG NULL #endif -#if defined(__i386__) || defined(__powerpc__) || defined(__x86_64__) +#if defined(__i386__) || defined(__powerpc__) #define have_ILP32_OFFBIG NULL #endif @@ -47,11 +44,11 @@ struct map { const char *name; const char *alt_path; int valid; }; POSIX_V6_ILP32_OFF32, notdef POSIX_V6_ILP32_OFFBIG, have_ILP32_OFFBIG POSIX_V6_LP64_OFF64, have_LP64_OFF64 -POSIX_V6_LPBIG_OFFBIG, have_LPBIG_OFFBIG +POSIX_V6_LPBIG_OFFBIG, notdef _POSIX_V6_ILP32_OFF32, notdef _POSIX_V6_ILP32_OFFBIG, have_ILP32_OFFBIG _POSIX_V6_LP64_OFF64, have_LP64_OFF64 -_POSIX_V6_LPBIG_OFFBIG, have_LPBIG_OFFBIG +_POSIX_V6_LPBIG_OFFBIG, notdef %% int find_progenv(const char *name, const char **alt_path) diff --git a/usr.bin/getconf/sysconf.gperf b/usr.bin/getconf/sysconf.gperf index f6f750af64d2..6a0a34989877 100644 --- a/usr.bin/getconf/sysconf.gperf +++ b/usr.bin/getconf/sysconf.gperf @@ -9,9 +9,6 @@ #include #include -#ifdef APPLE_GETCONF_UNDERSCORE -#include -#endif /* APPLE_GETCONF_UNDERSCORE */ #include "getconf.h" @@ -73,16 +70,9 @@ _POSIX2_C_VERSION, _SC_2_C_VERSION _POSIX2_FORT_DEV, _SC_2_FORT_DEV _POSIX2_FORT_RUN, _SC_2_FORT_RUN _POSIX2_LOCALEDEF, _SC_2_LOCALEDEF -_POSIX2_PBS, _SC_PBS -_POSIX2_PBS_ACCOUNTING, _SC_PBS_ACCOUNTING -_POSIX2_PBS_CHECKPOINT, _SC_PBS_CHECKPOINT -_POSIX2_PBS_LOCATE, _SC_PBS_LOCATE -_POSIX2_PBS_MESSAGE, _SC_PBS_MESSAGE -_POSIX2_PBS_TRACK, _SC_PBS_TRACK _POSIX2_SW_DEV, _SC_2_SW_DEV _POSIX2_UPE, _SC_2_UPE _POSIX2_VERSION, _SC_2_VERSION -_POSIX_ADVISORY_INFO, _SC_ADVISORY_INFO _POSIX_ASYNCHRONOUS_IO, _SC_ASYNCHRONOUS_IO _POSIX_BARRIERS, _SC_BARRIERS _POSIX_CLOCK_SELECTION, _SC_CLOCK_SELECTION @@ -99,7 +89,6 @@ _POSIX_MESSAGE_PASSING, _SC_MESSAGE_PASSING _POSIX_MONOTONIC_CLOCK, _SC_MONOTONIC_CLOCK _POSIX_PRIORITIZED_IO, _SC_PRIORITIZED_IO _POSIX_PRIORITY_SCHEDULING, _SC_PRIORITY_SCHEDULING -_POSIX_RAW_SOCKETS, _SC_RAW_SOCKETS _POSIX_READER_WRITER_LOCKS, _SC_READER_WRITER_LOCKS _POSIX_REALTIME_SIGNALS, _SC_REALTIME_SIGNALS _POSIX_REGEXP, _SC_REGEXP @@ -110,7 +99,6 @@ _POSIX_SHELL, _SC_SHELL _POSIX_SPAWN, _SC_SPAWN _POSIX_SPIN_LOCKS, _SC_SPIN_LOCKS _POSIX_SPORADIC_SERVER, _SC_SPORADIC_SERVER -_POSIX_SS_REPL_MAX, _SC_SS_REPL_MAX _POSIX_SYNCHRONIZED_IO, _SC_SYNCHRONIZED_IO _POSIX_THREADS, _SC_THREADS _POSIX_THREAD_ATTR_STACKADDR, _SC_THREAD_ATTR_STACKADDR @@ -123,28 +111,23 @@ _POSIX_THREAD_PROCESS_SHARED, _SC_THREAD_PROCESS_SHARED _POSIX_THREAD_SAFE_FUNCTIONS, _SC_THREAD_SAFE_FUNCTIONS _POSIX_THREAD_SPORADIC_SERVER, _SC_THREAD_SPORADIC_SERVER _POSIX_TIMEOUTS, _SC_TIMEOUTS -_POSIX_TIMERS, _SC_TIMERS _POSIX_TRACE, _SC_TRACE _POSIX_TRACE_EVENT_FILTER, _SC_TRACE_EVENT_FILTER -_POSIX_TRACE_EVENT_NAME_MAX, _SC_TRACE_EVENT_NAME_MAX _POSIX_TRACE_INHERIT, _SC_TRACE_INHERIT _POSIX_TRACE_LOG, _SC_TRACE_LOG -_POSIX_TRACE_NAME_MAX, _SC_TRACE_NAME_MAX -_POSIX_TRACE_SYS_MAX, _SC_TRACE_SYS_MAX -_POSIX_TRACE_USER_EVENT_MAX, _SC_TRACE_USER_EVENT_MAX +_POSIX_TIMERS, _SC_TIMERS _POSIX_TYPED_MEMORY_OBJECTS, _SC_TYPED_MEMORY_OBJECTS +_POSIX_VERSION, _SC_VERSION _POSIX_V6_ILP32_OFF32, _SC_V6_ILP32_OFF32 _POSIX_V6_ILP32_OFFBIG, _SC_V6_ILP32_OFFBIG _POSIX_V6_LP64_OFF64, _SC_V6_LP64_OFF64 _POSIX_V6_LPBIG_OFFBIG, _SC_V6_LPBIG_OFFBIG -_POSIX_VERSION, _SC_VERSION _XOPEN_CRYPT, _SC_XOPEN_CRYPT _XOPEN_ENH_I18N, _SC_XOPEN_ENH_I18N _XOPEN_LEGACY, _SC_XOPEN_LEGACY _XOPEN_REALTIME, _SC_XOPEN_REALTIME _XOPEN_REALTIME_THREADS, _SC_XOPEN_REALTIME_THREADS _XOPEN_SHM, _SC_XOPEN_SHM -_XOPEN_STREAMS, _SC_XOPEN_STREAMS _XOPEN_UNIX, _SC_XOPEN_UNIX _XOPEN_VERSION, _SC_XOPEN_VERSION _XOPEN_XCU_VERSION, _SC_XCU_VERSION @@ -153,9 +136,6 @@ int find_sysconf(const char *name, int *key) { const struct map *rv; -#ifdef APPLE_GETCONF_UNDERSCORE - char *alt; -#endif /* APPLE_GETCONF_UNDERSCORE */ rv = in_word_set(name); if (rv != NULL) { @@ -165,23 +145,5 @@ find_sysconf(const char *name, int *key) } return -1; } -#ifdef APPLE_GETCONF_UNDERSCORE - if(*name == '_') - alt = (char *)name + 1; - else { - if((alt = (char *)alloca(strlen(name) + 2)) == NULL) - return 0; - *alt = '_'; - strcpy(alt + 1, name); - } - rv = in_word_set(alt); - if (rv != NULL) { - if (rv->valid) { - *key = rv->key; - return 1; - } - return -1; - } -#endif /* APPLE_GETCONF_UNDERSCORE */ return 0; } diff --git a/usr.sbin/nscd/nscd.c b/usr.sbin/nscd/nscd.c index 33b6aa52350a..6b5af943a500 100644 --- a/usr.sbin/nscd/nscd.c +++ b/usr.sbin/nscd/nscd.c @@ -167,7 +167,7 @@ init_runtime_env(struct configuration *config) retval = calloc(1, sizeof(*retval)); assert(retval != NULL); - retval->sockfd = socket(PF_LOCAL, SOCK_STREAM|SOCK_NONBLOCK, 0); + retval->sockfd = socket(PF_LOCAL, SOCK_STREAM, 0); if (config->force_unlink == 1) unlink(config->socket_path); @@ -198,6 +198,7 @@ init_runtime_env(struct configuration *config) */ chmod(config->socket_path, config->socket_mode); listen(retval->sockfd, -1); + fcntl(retval->sockfd, F_SETFL, O_NONBLOCK); retval->queue = kqueue(); assert(retval->queue != -1); diff --git a/usr.sbin/nscd/nscdcli.c b/usr.sbin/nscd/nscdcli.c index e43b658b79ef..9b0720116dc4 100644 --- a/usr.sbin/nscd/nscdcli.c +++ b/usr.sbin/nscd/nscdcli.c @@ -189,7 +189,7 @@ open_nscd_connection__(struct nscd_connection_params const *params) TRACE_IN(open_nscd_connection); assert(params != NULL); - client_socket = socket(PF_LOCAL, SOCK_STREAM|SOCK_NONBLOCK, 0); + client_socket = socket(PF_LOCAL, SOCK_STREAM, 0); client_address.sun_family = PF_LOCAL; strlcpy(client_address.sun_path, params->socket_path, sizeof(client_address.sun_path)); @@ -203,6 +203,7 @@ open_nscd_connection__(struct nscd_connection_params const *params) TRACE_OUT(open_nscd_connection); return (NULL); } + fcntl(client_socket, F_SETFL, O_NONBLOCK); retval = calloc(1, sizeof(*retval)); assert(retval != NULL);