Changeset 4900
- Timestamp:
- 04/03/11 02:27:39 (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/module-dvbapi.c
r4898 r4900 129 129 snprintf(device_path, sizeof(device_path), devices[i].path, 0); 130 130 131 s nprintf(device_path, sizeof(device_path), "%s%s", device_path, device_path2);131 strncat(device_path, device_path2, sizeof(device_path)-strlen(device_path)-1); 132 132 133 133 if ((dmx_fd = open(device_path, O_RDWR)) > 0) { … … 213 213 snprintf(device_path, sizeof(device_path), devices[selected_box].path, adapter); 214 214 215 s nprintf(device_path, sizeof(device_path), "%s%s", device_path, device_path2);215 strncat(device_path, device_path2, sizeof(device_path)-strlen(device_path)-1); 216 216 } else { 217 217 if (cfg.dvbapi_boxtype==BOXTYPE_DUCKBOX || cfg.dvbapi_boxtype==BOXTYPE_DBOX2 || cfg.dvbapi_boxtype==BOXTYPE_UFS910) … … 224 224 snprintf(device_path, sizeof(device_path), devices[selected_box].path, adapter); 225 225 226 s nprintf(device_path, sizeof(device_path), "%s%s", device_path, device_path2);226 strncat(device_path, device_path2, sizeof(device_path)-strlen(device_path)-1); 227 227 } 228 228 … … 1072 1072 1073 1073 if (pmtfile) 1074 cs_strncpy(demux[demux_id].pmt_file, pmtfile, 30);1074 cs_strncpy(demux[demux_id].pmt_file, pmtfile, sizeof(demux[demux_id].pmt_file)); 1075 1075 1076 1076 if (program_info_length > 1 && program_info_length < length) … … 1389 1389 #endif 1390 1390 if (pmt_id>=0) { 1391 cs_strncpy(demux[pmt_id].pmt_file, dp->d_name, 30);1391 cs_strncpy(demux[pmt_id].pmt_file, dp->d_name, sizeof(demux[pmt_id].pmt_file)); 1392 1392 demux[pmt_id].pmt_time = pmt_info.st_mtime; 1393 1393 } … … 1984 1984 //oscam_stapi_Capability(dp->d_name); 1985 1985 1986 cs_strncpy(dev_list[i].name,dp->d_name, 20);1986 cs_strncpy(dev_list[i].name,dp->d_name, sizeof(dev_list[i].name)); 1987 1987 cs_log("PTI: %s open %d", dp->d_name, i); 1988 1988
Note:
See TracChangeset
for help on using the changeset viewer.