diff -urN mc-4.7.1-old/src/file.c mc-4.7.1-new/src/file.c
old
|
new
|
|
351 | 351 | progress_update_one (FileOpTotalContext *tctx, FileOpContext *ctx, off_t add, gboolean is_toplevel_file) |
352 | 352 | { |
353 | 353 | struct timeval tv_current; |
354 | | static struct timeval tv_start = {}; |
| 354 | static struct timeval tv_start = { 0 }; |
355 | 355 | |
356 | 356 | if (is_toplevel_file || ctx->progress_totals_computed) { |
357 | 357 | tctx->progress_count++; |
diff -urN mc-4.7.1-old/src/find.c mc-4.7.1-new/src/find.c
old
|
new
|
|
1328 | 1328 | gboolean dir_and_file_set; |
1329 | 1329 | |
1330 | 1330 | while (find_parameters (&start_dir, &pattern, &content)){ |
| 1331 | if (pattern == NULL) |
| 1332 | break; |
| 1333 | |
1331 | 1334 | if (pattern [0] == '\0') |
1332 | | break; /* nothing search*/ |
| 1335 | break; /* nothing search */ |
1333 | 1336 | |
1334 | 1337 | dirname = filename = NULL; |
1335 | 1338 | is_start = FALSE; |
1336 | 1339 | v = find_file (start_dir, pattern, content, &dirname, &filename); |
| 1340 | g_free (start_dir); |
1337 | 1341 | g_free (pattern); |
1338 | 1342 | |
1339 | 1343 | if (v == B_ENTER){ |
… |
… |
|
1343 | 1347 | if (filename) |
1344 | 1348 | try_to_select (current_panel, filename + (content ? |
1345 | 1349 | (strchr (filename + 4, ':') - filename + 1) : 4) ); |
1346 | | } else if (filename) |
| 1350 | } else if (filename) { |
1347 | 1351 | do_cd (filename, cd_exact); |
| 1352 | } |
1348 | 1353 | select_item (current_panel); |
1349 | 1354 | } |
| 1355 | g_free (content); |
1350 | 1356 | g_free (dirname); |
1351 | 1357 | g_free (filename); |
1352 | 1358 | break; |
diff -urN mc-4.7.1-old/src/subshell.c mc-4.7.1-new/src/subshell.c
old
|
new
|
|
233 | 233 | mc_sid = getsid (0); |
234 | 234 | if (mc_sid != -1) { |
235 | 235 | char sid_str[BUF_SMALL]; |
| 236 | char *tmp; |
| 237 | |
236 | 238 | g_snprintf (sid_str, sizeof (sid_str), "MC_SID=%ld", |
237 | 239 | (long) mc_sid); |
238 | | putenv (g_strdup (sid_str)); |
| 240 | tmp = g_strdup (sid_str); |
| 241 | putenv (tmp); |
| 242 | g_free (tmp); |
239 | 243 | } |
240 | 244 | |
241 | 245 | switch (subshell_type) { |