author | brad <brad> | 2004-03-29 16:57:42 (UTC) |
---|---|---|
committer | brad <brad> | 2004-03-29 16:57:42 (UTC) |
commit | e15bbcc647d8e236c5cc1539f8fcd8a4f6809c1e (patch) (unidiff) | |
tree | f8501dfa36a106437af7d09fb21e385d1d131a50 /core | |
parent | b34d33b14b77331c0de16d3c80f929512003f06c (diff) | |
download | opie-e15bbcc647d8e236c5cc1539f8fcd8a4f6809c1e.zip opie-e15bbcc647d8e236c5cc1539f8fcd8a4f6809c1e.tar.gz opie-e15bbcc647d8e236c5cc1539f8fcd8a4f6809c1e.tar.bz2 |
Add workaround for the new format of ipkg written list files on external media.
Works with old and new versions of ipkg now and does not touch anything set up by
other package management programs
-rw-r--r-- | core/symlinker/main.cpp | 31 |
1 files changed, 25 insertions, 6 deletions
diff --git a/core/symlinker/main.cpp b/core/symlinker/main.cpp index 73d5166..6a04980 100644 --- a/core/symlinker/main.cpp +++ b/core/symlinker/main.cpp | |||
@@ -2,92 +2,111 @@ | |||
2 | #include <qfile.h> | 2 | #include <qfile.h> |
3 | #include <qfileinfo.h> | 3 | #include <qfileinfo.h> |
4 | #include <qdir.h> | 4 | #include <qdir.h> |
5 | #include <qtextstream.h> | 5 | #include <qtextstream.h> |
6 | #include <qstringlist.h> | 6 | #include <qstringlist.h> |
7 | 7 | ||
8 | #include <stdlib.h> | 8 | #include <stdlib.h> |
9 | #include <unistd.h> //symlink() | 9 | #include <unistd.h> //symlink() |
10 | #include <sys/stat.h> // mkdir() | 10 | #include <sys/stat.h> // mkdir() |
11 | 11 | ||
12 | #include <sys/vfs.h> | 12 | #include <sys/vfs.h> |
13 | #include <mntent.h> | 13 | #include <mntent.h> |
14 | #include <errno.h> | ||
14 | 15 | ||
15 | static const char *listDir = "/usr/lib/ipkg/externinfo/"; | 16 | static const char *listDir = "/usr/lib/ipkg/externinfo/"; |
16 | 17 | ||
17 | static void createSymlinks( const QString &location, const QString &package ) | 18 | static void createSymlinks( const QString &location, const QString &package ) |
18 | { | 19 | { |
20 | |||
19 | QFile inFile( location + "/usr/lib/ipkg/info/" + package + ".list" ); | 21 | QFile inFile( location + "/usr/lib/ipkg/info/" + package + ".list" ); |
20 | mkdir( "/usr/lib/ipkg", 0777 ); | 22 | mkdir( "/usr/lib/ipkg", 0777 ); |
21 | mkdir( listDir, 0777 ); | 23 | mkdir( listDir, 0777 ); |
22 | 24 | ||
23 | QFile outFile( listDir + package + ".list"); | 25 | QFile outFile( listDir + package + ".list"); |
24 | 26 | ||
25 | //qDebug( "createSymlinks %s -> %s", inFile.name().ascii(), outFile.name().ascii() ); | 27 | //qDebug( "createSymlinks %s -> %s", inFile.name().ascii(), outFile.name().ascii() ); |
26 | 28 | ||
27 | 29 | ||
28 | 30 | ||
29 | if ( inFile.open(IO_ReadOnly) && outFile.open(IO_WriteOnly)) { | 31 | if ( inFile.open(IO_ReadOnly) && outFile.open(IO_WriteOnly)) { |
30 | QTextStream in(&inFile); | 32 | QTextStream in(&inFile); |
31 | QTextStream out(&outFile); | 33 | QTextStream out(&outFile); |
32 | 34 | ||
33 | QString s; | 35 | QString s; |
34 | while ( !in.eof() ) { // until end of file... | 36 | while ( !in.eof() ) { // until end of file... |
35 | s = in.readLine(); // line of text excluding '\n' | 37 | s = in.readLine(); // line of text excluding '\n' |
36 | //qDebug( "Read: %s", s.ascii() ); | 38 | //qDebug( "Read: %s", s.ascii() ); |
39 | if (s.find(location,0,true) >= 0){ | ||
40 | // qDebug( "Found!" ); | ||
41 | s = s.replace(location,""); | ||
42 | } | ||
43 | // qDebug( "Read after: %s", s.ascii() ); | ||
44 | |||
37 | // for s, do link/mkdir. | 45 | // for s, do link/mkdir. |
38 | if ( s.right(1) == "/" ) { | 46 | if ( s.right(1) == "/" ) { |
39 | //qDebug("do mkdir for %s", s.ascii()); | 47 | //qDebug("do mkdir for %s", s.ascii()); |
40 | mkdir( s.ascii(), 0777 ); | 48 | mkdir( s.ascii(), 0777 ); |
41 | //possible optimization: symlink directories | 49 | //possible optimization: symlink directories |
42 | //that don't exist already. -- Risky. | 50 | //that don't exist already. -- Risky. |
43 | } else { | 51 | } else { |
44 | //qDebug("do symlink for %s", s.ascii()); | 52 | //qDebug("do symlink for %s", s.ascii()); |
45 | QFileInfo ffi( s ); | 53 | QFileInfo ffi( s ); |
46 | //Don't try to symlink if a regular file exists already | 54 | //Don't try to symlink if a regular file exists already |
47 | if ( !ffi.exists() || ffi.isSymLink() ) { | 55 | if ( !ffi.exists() || ffi.isSymLink() ) { |
48 | symlink( (location+s).ascii(), s.ascii() ); | 56 | if (symlink( (location+s).ascii(), s.ascii() ) != 0){ |
57 | if (errno == ENOENT){ | ||
58 | // perror("Symlink Failed! "); | ||
59 | QString e=s.ascii(); | ||
60 | e = e.replace(ffi.fileName(),""); | ||
61 | // qDebug("DirName : %s",e.ascii() ); | ||
62 | system ( QString("mkdir -p ")+e.ascii() ); | ||
63 | if (symlink( (location+s).ascii(), s.ascii() ) != 0) | ||
64 | qDebug ("Big problem creating symlink and directory"); | ||
65 | } | ||
66 | } | ||
49 | // qDebug ( "Created %s" ,s.ascii() ); | 67 | // qDebug ( "Created %s" ,s.ascii() ); |
50 | out << s << "\n"; | 68 | out << s << "\n"; |
51 | } //else { | 69 | } else { |
52 | // qDebug( "%s exists already, not symlinked", s.ascii() ); | 70 | qDebug( "%s exists already, not symlinked", s.ascii() ); |
53 | // } | 71 | } |
54 | } | 72 | } |
55 | } | 73 | } |
56 | inFile.close(); | 74 | inFile.close(); |
57 | outFile.close(); | 75 | outFile.close(); |
58 | } | 76 | } |
59 | } | 77 | } |
60 | 78 | ||
61 | 79 | ||
62 | 80 | ||
63 | static void removeSymlinks( const QString &package ) | 81 | static void removeSymlinks( const QString &package ) |
64 | { | 82 | { |
65 | QFile inFile( listDir + package + ".list" ); | 83 | QFile inFile( listDir + package + ".list" ); |
66 | 84 | ||
67 | if ( inFile.open(IO_ReadOnly) ) { | 85 | if ( inFile.open(IO_ReadOnly) ) { |
68 | QTextStream in(&inFile); | 86 | QTextStream in(&inFile); |
69 | 87 | ||
70 | QString s; | 88 | QString s; |
71 | while ( !in.eof() ) { // until end of file... | 89 | while ( !in.eof() ) { // until end of file... |
72 | s = in.readLine(); // line of text excluding '\n' | 90 | s = in.readLine(); // line of text excluding '\n' |
73 | //qDebug("remove symlink %s", s.ascii()); | 91 | //qDebug("remove symlink %s", s.ascii()); |
74 | QFileInfo ffi( s ); | 92 | QFileInfo ffi( s ); |
75 | //Confirm that it's still a symlink. | 93 | //Confirm that it's still a symlink. |
76 | if ( ffi.isSymLink() ) | 94 | if ( ffi.isSymLink() ){ |
77 | unlink( s.ascii() ); | 95 | unlink( s.ascii() ); |
78 | // qDebug ( "Removed %s", s.ascii() ); | 96 | // qDebug ( "Removed %s", s.ascii() );} |
79 | // else | 97 | // else |
80 | // qDebug( "Not removed %s", s.ascii() ); | 98 | // qDebug( "Not removed %s", s.ascii() ); |
81 | } | 99 | } |
100 | } | ||
82 | inFile.close(); | 101 | inFile.close(); |
83 | inFile.remove(); | 102 | inFile.remove(); |
84 | } | 103 | } |
85 | } | 104 | } |
86 | 105 | ||
87 | 106 | ||
88 | 107 | ||
89 | /* | 108 | /* |
90 | Slightly hacky: we can't use StorageInfo, since we don't have a | 109 | Slightly hacky: we can't use StorageInfo, since we don't have a |
91 | QApplication. We look for filesystems that have the directory | 110 | QApplication. We look for filesystems that have the directory |
92 | /usr/lib/ipkg/info, and assume that they are removable media | 111 | /usr/lib/ipkg/info, and assume that they are removable media |
93 | with packages installed. This is safe even if eg. /usr is on a | 112 | with packages installed. This is safe even if eg. /usr is on a |