Mercurial > illumos > illumos-gate
changeset 10621:a6ab13bfdd64
6842564 SUNWcdrw package dependency issue with snv_115
6841362 cdrw -b fails, core dumped
author | Zach Kissel <Zachary.Kissel@Sun.COM> |
---|---|
date | Wed, 23 Sep 2009 09:39:54 -0400 |
parents | a9d7350484cf |
children | de30154fc5f5 |
files | usr/src/cmd/cdrw/device.c usr/src/pkgdefs/SUNWcdrw/Makefile usr/src/pkgdefs/SUNWcdrw/depend |
diffstat | 3 files changed, 66 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/usr/src/cmd/cdrw/device.c Wed Sep 23 03:52:25 2009 -0700 +++ b/usr/src/cmd/cdrw/device.c Wed Sep 23 09:39:54 2009 -0400 @@ -19,12 +19,10 @@ * CDDL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/types.h> #include <fcntl.h> #include <errno.h> @@ -360,9 +358,15 @@ char **udi, *path = NULL; int ndevs = 0, i; - /* We already have a raw path just return that */ - if (symname[0] == '/') - return (symname); + /* + * We already have a raw path lets return it in a copied buffer + * as our caller assumes that they need to free memory. + */ + if (symname[0] == '/') { + path = my_zalloc(strlen(symname) + 1); + (void) strlcpy(path, symname, (strlen(symname) + 1)); + return (path); + } /* Get the raw device from the hal record */ if (vol_running != 0) {
--- a/usr/src/pkgdefs/SUNWcdrw/Makefile Wed Sep 23 03:52:25 2009 -0700 +++ b/usr/src/pkgdefs/SUNWcdrw/Makefile Wed Sep 23 09:39:54 2009 -0400 @@ -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,19 +19,14 @@ # CDDL HEADER END # # -#ident "%Z%%M% %I% %E% SMI" -# -# Copyright (c) 2001 by Sun Microsystems, Inc. -# All rights reserved. +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. # - include ../Makefile.com -DATAFILES += depend - .KEEP_STATE: -all: $(FILES) +all: $(FILES) depend install: all pkg include ../Makefile.targ
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/usr/src/pkgdefs/SUNWcdrw/depend Wed Sep 23 09:39:54 2009 -0400 @@ -0,0 +1,51 @@ +# +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# 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. +# 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 +# +# This package information file defines software dependencies associated +# with the pkg. You can define three types of pkg dependencies with this file: +# P indicates a prerequisite for installation +# I indicates an incompatible package +# R indicates a reverse dependency +# <pkg.abbr> see pkginfo(4), PKG parameter +# <name> see pkginfo(4), NAME parameter +# <version> see pkginfo(4), VERSION parameter +# <arch> see pkginfo(4), ARCH parameter +# <type> <pkg.abbr> <name> +# (<arch>)<version> +# (<arch>)<version> +# ... +# <type> <pkg.abbr> <name> +# ... +# + +P SUNWcar Core Architecture, (Root) +P SUNWcakr Core Solaris Kernel Architecture (Root) +P SUNWkvm Core Architecture, (Kvm) +P SUNWcsr Core Solaris, (Root) +P SUNWckr Core Solaris Kernel (Root) +P SUNWcnetr Core Solaris Network Infrastructure (Root) +P SUNWcsu Core Solaris, (Usr) +P SUNWcsd Core Solaris Devices +P SUNWcsl Core Solaris Libraries +P SUNWhal Hardware Abstraction Layer +P SUNWdbus-libs Simple IPC library based on messages - client libraries