blob: 521ca9c54c1ed275fd592a6e51eac4a73850c2a5 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
|
--- a/bon_file.cpp
+++ b/bon_file.cpp
@@ -469,25 +469,37 @@ int COpenTest::delete_sequential(BonTime
}
if(m_number_directories != 1)
{
- if(chdir("..") || rmdir(buf))
+ if(chdir(".."))
{
+ io_error("chdir");
+ return -1;
+ }
+ if(rmdir(buf))
+ {
+ fprintf(stderr, "Unable to delete directory '%s'\n", buf);
io_error("rmdir");
return -1;
}
}
}
- if(chdir("..") || rmdir(m_dirname))
+ if(count != m_number)
{
- io_error("rmdir");
+ fprintf(stderr, "Expected %d files but only got %d\n", m_number, count);
return -1;
}
- delete m_dirname;
- m_dirname = NULL;
- if(count != m_number)
+ if(chdir(".."))
{
- fprintf(stderr, "Expected %d files but only got %d\n", m_number, count);
+ io_error("chdir");
+ return -1;
+ }
+ if(rmdir(m_dirname))
+ {
+ fprintf(stderr, "Unable to delete directory '%s'\n", m_dirname);
+ io_error("rmdir");
return -1;
}
+ delete m_dirname;
+ m_dirname = NULL;
sync();
timer.stop_and_record(DelSeq);
timer.add_latency(DelSeq, dur.getMax());
|