| mount_cd9660.c (122080) | mount_cd9660.c (123293) |
|---|---|
| 1/* 2 * Copyright (c) 1992, 1993, 1994 3 * The Regents of the University of California. All rights reserved. 4 * 5 * This code is derived from software contributed to Berkeley 6 * by Pace Willisson (pace@blitz.com). The Rock Ridge Extension 7 * Support code is derived from software contributed to Berkeley 8 * by Atsushi Murai (amurai@spec.co.jp). --- 35 unchanged lines hidden (view full) --- 44 The Regents of the University of California. All rights reserved.\n"; 45#endif /* not lint */ 46 47#ifndef lint 48/* 49static char sccsid[] = "@(#)mount_cd9660.c 8.7 (Berkeley) 5/1/95"; 50*/ 51static const char rcsid[] = | 1/* 2 * Copyright (c) 1992, 1993, 1994 3 * The Regents of the University of California. All rights reserved. 4 * 5 * This code is derived from software contributed to Berkeley 6 * by Pace Willisson (pace@blitz.com). The Rock Ridge Extension 7 * Support code is derived from software contributed to Berkeley 8 * by Atsushi Murai (amurai@spec.co.jp). --- 35 unchanged lines hidden (view full) --- 44 The Regents of the University of California. All rights reserved.\n"; 45#endif /* not lint */ 46 47#ifndef lint 48/* 49static char sccsid[] = "@(#)mount_cd9660.c 8.7 (Berkeley) 5/1/95"; 50*/ 51static const char rcsid[] = |
| 52 "$FreeBSD: head/sbin/mount_cd9660/mount_cd9660.c 122080 2003-11-04 21:04:14Z trhodes $"; | 52 "$FreeBSD: head/sbin/mount_cd9660/mount_cd9660.c 123293 2003-12-08 08:32:20Z fjoe $"; |
| 53#endif /* not lint */ 54 55#include <sys/cdio.h> 56#include <sys/file.h> 57#include <sys/param.h> 58#include <sys/mount.h> 59#include <sys/../isofs/cd9660/cd9660_mount.h> 60#include <sys/module.h> --- 189 unchanged lines hidden (view full) --- 250 251 if ((args->cs_disk = malloc(ICONV_CSNMAXLEN)) == NULL) 252 return (-1); 253 if ((args->cs_local = malloc(ICONV_CSNMAXLEN)) == NULL) 254 return (-1); 255 strncpy(args->cs_disk, ENCODING_UNICODE, ICONV_CSNMAXLEN); 256 strncpy(args->cs_local, kiconv_quirkcs(localcs, KICONV_VENDOR_MICSFT), 257 ICONV_CSNMAXLEN); | 53#endif /* not lint */ 54 55#include <sys/cdio.h> 56#include <sys/file.h> 57#include <sys/param.h> 58#include <sys/mount.h> 59#include <sys/../isofs/cd9660/cd9660_mount.h> 60#include <sys/module.h> --- 189 unchanged lines hidden (view full) --- 250 251 if ((args->cs_disk = malloc(ICONV_CSNMAXLEN)) == NULL) 252 return (-1); 253 if ((args->cs_local = malloc(ICONV_CSNMAXLEN)) == NULL) 254 return (-1); 255 strncpy(args->cs_disk, ENCODING_UNICODE, ICONV_CSNMAXLEN); 256 strncpy(args->cs_local, kiconv_quirkcs(localcs, KICONV_VENDOR_MICSFT), 257 ICONV_CSNMAXLEN); |
| 258 error = kiconv_add_xlat16_cspair(args->cs_local, args->cs_disk, 0); | 258 error = kiconv_add_xlat16_cspairs(args->cs_disk, args->cs_local); |
| 259 if (error) 260 return (-1); | 259 if (error) 260 return (-1); |
| 261 error = kiconv_add_xlat16_cspair(args->cs_disk, args->cs_local, 0); 262 if (error) 263 return (-1); | |
| 264 265 return (0); 266} | 261 262 return (0); 263} |