claunia/libcdio-osx
Archived
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

add psz_ to hwinfo type.

Browse Source 
_cdio_linux.c: go back to using SCSI MMC drive cap routine.
This commit is contained in:
rocky
2004-08-27 11:53:38 +00:00
parent c495bfdfa7
commit 19991ded7b
6 changed files with 49 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/_cdio_linux.c
View File

@@ -1,5 +1,5 @@
/*
$Id: _cdio_linux.c,v 1.95 2004/08/27 01:24:40 rocky Exp $
$Id: _cdio_linux.c,v 1.96 2004/08/27 11:53:38 rocky Exp $
Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
Copyright (C) 2002, 2003, 2004 Rocky Bernstein <rocky@panix.com>
@@ -27,7 +27,7 @@
# include "config.h"
#endif
static const char _rcsid[] = "$Id: _cdio_linux.c,v 1.95 2004/08/27 01:24:40 rocky Exp $";
static const char _rcsid[] = "$Id: _cdio_linux.c,v 1.96 2004/08/27 11:53:38 rocky Exp $";
#include <string.h>
@@ -218,7 +218,7 @@ get_arg_linux (void *env, const char key[])
return NULL;
}
#define USE_LINUX_CAP 1
#undef USE_LINUX_CAP
#ifdef USE_LINUX_CAP
/*!
Return the the kind of drive capabilities of device.

20
lib/scsi_mmc.c
View File

@@ -1,6 +1,6 @@
/* Common SCSI Multimedia Command (MMC) routines.
$Id: scsi_mmc.c,v 1.26 2004/08/27 02:50:13 rocky Exp $
$Id: scsi_mmc.c,v 1.27 2004/08/27 11:53:38 rocky Exp $
Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
@@ -445,18 +445,18 @@ scsi_mmc_get_hwinfo ( const CdIo *p_cdio,
sizeof(buf), &buf);
if (i_status == 0) {
memcpy(hw_info->vendor,
memcpy(hw_info->psz_vendor,
buf + 8,
sizeof(hw_info->vendor)-1);
hw_info->vendor[sizeof(hw_info->vendor)-1] = '\0';
memcpy(hw_info->model,
sizeof(hw_info->psz_vendor)-1);
hw_info->psz_vendor[sizeof(hw_info->psz_vendor)-1] = '\0';
memcpy(hw_info->psz_model,
buf + 8 + CDIO_MMC_HW_VENDOR_LEN,
sizeof(hw_info->model)-1);
hw_info->model[sizeof(hw_info->model)-1] = '\0';
memcpy(hw_info->revision,
sizeof(hw_info->psz_model)-1);
hw_info->psz_model[sizeof(hw_info->psz_model)-1] = '\0';
memcpy(hw_info->psz_revision,
buf + 8 + CDIO_MMC_HW_VENDOR_LEN + CDIO_MMC_HW_MODEL_LEN,
sizeof(hw_info->revision)-1);
hw_info->revision[sizeof(hw_info->revision)-1] = '\0';
sizeof(hw_info->psz_revision)-1);
hw_info->psz_revision[sizeof(hw_info->psz_revision)-1] = '\0';
return true;
}
return false;