-rw-r--r-- | noncore/apps/odict/eng_ita.dic | 2 | ||||
-rw-r--r-- | noncore/apps/opie-console/filereceive.cpp | 2 | ||||
-rw-r--r-- | noncore/apps/opie-console/filetransfer.cpp | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/noncore/apps/odict/eng_ita.dic b/noncore/apps/odict/eng_ita.dic index f338faa..6db2389 100644 --- a/noncore/apps/odict/eng_ita.dic +++ b/noncore/apps/odict/eng_ita.dic | |||
@@ -10555,97 +10555,96 @@ sinks\abbassa | |||
10555 | sinned\peccato | 10555 | sinned\peccato |
10556 | sinner\peccatore | 10556 | sinner\peccatore |
10557 | sins\peccati | 10557 | sins\peccati |
10558 | sinuous\contorto | 10558 | sinuous\contorto |
10559 | sip\sorso | 10559 | sip\sorso |
10560 | sir\signore | 10560 | sir\signore |
10561 | sire\testimoniare | 10561 | sire\testimoniare |
10562 | sirloin\lonza | 10562 | sirloin\lonza |
10563 | sissy\effeminato | 10563 | sissy\effeminato |
10564 | sister\sorella | 10564 | sister\sorella |
10565 | sister in law\cognata | 10565 | sister in law\cognata |
10566 | sit\star seduto | 10566 | sit\star seduto |
10567 | sit down\accomodarsi | 10567 | sit down\accomodarsi |
10568 | site\posto, circostanza | 10568 | site\posto, circostanza |
10569 | site of crime\luogo del fatto | 10569 | site of crime\luogo del fatto |
10570 | sits\siede | 10570 | sits\siede |
10571 | sitting\seduto | 10571 | sitting\seduto |
10572 | sitting room\salotto | 10572 | sitting room\salotto |
10573 | situate\allineare, mettere, mettere | 10573 | situate\allineare, mettere, mettere |
10574 | situated\posto | 10574 | situated\posto |
10575 | situation\situazione, posizione, circostanza | 10575 | situation\situazione, posizione, circostanza |
10576 | six\sei | 10576 | six\sei |
10577 | sixfold\sestuplo | 10577 | sixfold\sestuplo |
10578 | sixteen\sedici | 10578 | sixteen\sedici |
10579 | sixteenth\sedicesimo, sedicesima | 10579 | sixteenth\sedicesimo, sedicesima |
10580 | sixth\sesto, sesta | 10580 | sixth\sesto, sesta |
10581 | sixty\sessanta | 10581 | sixty\sessanta |
10582 | size\grossezza | 10582 | size\grossezza |
10583 | size of shoe\numero di scarpa | 10583 | size of shoe\numero di scarpa |
10584 | sizzle\grillare | 10584 | sizzle\grillare |
10585 | skating\pattinaggio artistico | 10585 | skating\pattinaggio artistico |
10586 | skating ring\pista di ghiaccio | 10586 | skating ring\pista di ghiaccio |
10587 | skating rink\pista di ghiaccio | 10587 | skating rink\pista di ghiaccio |
10588 | skein\capestro | 10588 | skein\capestro |
10589 | skeins\capestri | 10589 | skeins\capestri |
10590 | skeleton\scheletro | 10590 | skeleton\scheletro |
10591 | skeletons\scheletri | 10591 | skeletons\scheletri |
10592 | skepticalness\scetticismo | 10592 | skepticalness\scetticismo |
10593 | skepticism\scetticismo | 10593 | skepticism\scetticismo |
10594 | sketch\abbozzo, abbozzare | 10594 | sketch\abbozzo, abbozzare |
10595 | sketchily\volatile, abbozzaticcio, superficiale | 10595 | sketchily\volatile, abbozzaticcio, superficiale |
10596 | sketchiness\poca chiarezza | 10596 | sketchiness\poca chiarezza |
10597 | sketchy\torbido | 10597 | sketchy\torbido |
10598 | skews\storto | 10598 | skews\storto |
10599 | ski\sci | 10599 | ski\sci |
10600 | skid\discesa a valle, avventare | 10600 | skid\discesa a valle, avventare |
10601 | skiful\esperto | 10601 | skiful\esperto |
10602 | skilful\apprèndere, azzeccato | 10602 | skilful\apprèndere, azzeccato |
10603 | skilfull\apprèndere | ||
10604 | skill\sorte, disinvoltura | 10603 | skill\sorte, disinvoltura |
10605 | skilled\versato | 10604 | skilled\versato |
10606 | skilled worker\operaio specializzato | 10605 | skilled worker\operaio specializzato |
10607 | skillet\tegame | 10606 | skillet\tegame |
10608 | skillful\lesto, sveglio, esperto | 10607 | skillful\lesto, sveglio, esperto |
10609 | skillfulness\disinvoltura | 10608 | skillfulness\disinvoltura |
10610 | skimp\lesinare | 10609 | skimp\lesinare |
10611 | skimpiest\piccolissimo | 10610 | skimpiest\piccolissimo |
10612 | skimpily\scarso | 10611 | skimpily\scarso |
10613 | skimpiness\strettezza | 10612 | skimpiness\strettezza |
10614 | skimpy\scarso | 10613 | skimpy\scarso |
10615 | skin\epidèrmide, epidermide | 10614 | skin\epidèrmide, epidermide |
10616 | skinny\scremato, magro, secco | 10615 | skinny\scremato, magro, secco |
10617 | skins\pelli, pelli | 10616 | skins\pelli, pelli |
10618 | skip\saltellare, lancio | 10617 | skip\saltellare, lancio |
10619 | skipper\marinaio | 10618 | skipper\marinaio |
10620 | skirt\gonna | 10619 | skirt\gonna |
10621 | skirting board\battiscopa | 10620 | skirting board\battiscopa |
10622 | skit\satira | 10621 | skit\satira |
10623 | skittle\birillo | 10622 | skittle\birillo |
10624 | skittle alley\gioco dei birilli | 10623 | skittle alley\gioco dei birilli |
10625 | skivvy\biancherìa ìntima | 10624 | skivvy\biancherìa ìntima |
10626 | skulker\lima sorda | 10625 | skulker\lima sorda |
10627 | skunk\puzzola | 10626 | skunk\puzzola |
10628 | sky\cielo | 10627 | sky\cielo |
10629 | skylark\lodola | 10628 | skylark\lodola |
10630 | skyrocket\razzo | 10629 | skyrocket\razzo |
10631 | skyscraper\grattacielo, grattacielo | 10630 | skyscraper\grattacielo, grattacielo |
10632 | skyscrapers\grattacielo | 10631 | skyscrapers\grattacielo |
10633 | slab\frantumare | 10632 | slab\frantumare |
10634 | slack\lasco, floscio | 10633 | slack\lasco, floscio |
10635 | slack joint\contatto lasco | 10634 | slack joint\contatto lasco |
10636 | slack period\ristagno | 10635 | slack period\ristagno |
10637 | slacken\rilassare, rilassare | 10636 | slacken\rilassare, rilassare |
10638 | slackens\rilassato | 10637 | slackens\rilassato |
10639 | slacker\scansafatiche | 10638 | slacker\scansafatiche |
10640 | slacks\pantaloni | 10639 | slacks\pantaloni |
10641 | slake\allattamento | 10640 | slake\allattamento |
10642 | slam\sbattere | 10641 | slam\sbattere |
10643 | slammed\sbattuto | 10642 | slammed\sbattuto |
10644 | slander\calunniare | 10643 | slander\calunniare |
10645 | slanderer\calunniatore | 10644 | slanderer\calunniatore |
10646 | slanderous\calunnioso | 10645 | slanderous\calunnioso |
10647 | slanderousness\calunnia | 10646 | slanderousness\calunnia |
10648 | slant\declinazione | 10647 | slant\declinazione |
10649 | slanting\obliquo, obliquo | 10648 | slanting\obliquo, obliquo |
10650 | slantingly\obliqua | 10649 | slantingly\obliqua |
10651 | slap\picchiare, ceffone | 10650 | slap\picchiare, ceffone |
@@ -12604,97 +12603,96 @@ unwounded\illeso | |||
12604 | unwrought\grezzo | 12603 | unwrought\grezzo |
12605 | up\sù, a, sù, sù | 12604 | up\sù, a, sù, sù |
12606 | up above\sù | 12605 | up above\sù |
12607 | up there\lassù | 12606 | up there\lassù |
12608 | upbraiding\rimprovero | 12607 | upbraiding\rimprovero |
12609 | upbringing\creanza | 12608 | upbringing\creanza |
12610 | upchuck\vòmito | 12609 | upchuck\vòmito |
12611 | upcoming\prossimamente | 12610 | upcoming\prossimamente |
12612 | upgrade\estensione, ampliare | 12611 | upgrade\estensione, ampliare |
12613 | upgrades\trasportato | 12612 | upgrades\trasportato |
12614 | upgrading\estensione | 12613 | upgrading\estensione |
12615 | upheaval\elevamento | 12614 | upheaval\elevamento |
12616 | uphold\durare | 12615 | uphold\durare |
12617 | upholster\imbottire | 12616 | upholster\imbottire |
12618 | upholsterer\tappezziere | 12617 | upholsterer\tappezziere |
12619 | upkeep\manutenzione | 12618 | upkeep\manutenzione |
12620 | uplift\esaltare | 12619 | uplift\esaltare |
12621 | uplifting\alzante | 12620 | uplifting\alzante |
12622 | upon\a | 12621 | upon\a |
12623 | upper arm\braccio superiore | 12622 | upper arm\braccio superiore |
12624 | upper case character\lettera maiuscola | 12623 | upper case character\lettera maiuscola |
12625 | uppish\impettito | 12624 | uppish\impettito |
12626 | uppity\baldanzoso | 12625 | uppity\baldanzoso |
12627 | upraise\esaltare | 12626 | upraise\esaltare |
12628 | upraising\alzante | 12627 | upraising\alzante |
12629 | upright\pari, verticale | 12628 | upright\pari, verticale |
12630 | uprise\levarsi | 12629 | uprise\levarsi |
12631 | uproar\eccitazione | 12630 | uproar\eccitazione |
12632 | uproariously\liuto | 12631 | uproariously\liuto |
12633 | upshot\risultato | 12632 | upshot\risultato |
12634 | upstage\arrivista | 12633 | upstage\arrivista |
12635 | upstairs\in alto, sù | 12634 | upstairs\in alto, sù |
12636 | upturn\incremento | 12635 | upturn\incremento |
12637 | upwards\sù | 12636 | upwards\sù |
12638 | uranium\uranio | 12637 | uranium\uranio |
12639 | urban\urbano | 12638 | urban\urbano |
12640 | urge\premura, incoraggiare | 12639 | urge\premura, incoraggiare |
12641 | urgency\urgenza | 12640 | urgency\urgenza |
12642 | urgent\urgente, legante | 12641 | urgent\urgente, legante |
12643 | urine\orina, uroscopia | 12642 | urine\orina, uroscopia |
12644 | urn\urna | 12643 | urn\urna |
12645 | us\noi, a noi | 12644 | us\noi, a noi |
12646 | usable\usabile | 12645 | usable\usabile |
12647 | usage\uso | 12646 | usage\uso |
12648 | use\uso, adoperare | 12647 | use\uso, adoperare |
12649 | use up\esaurire | 12648 | use up\esaurire |
12650 | used\usato | 12649 | used\usato |
12651 | useful\utile | 12650 | useful\utile |
12652 | usefull\utile | ||
12653 | useless\inutile, disùtile, inservibile | 12651 | useless\inutile, disùtile, inservibile |
12654 | user\utente | 12652 | user\utente |
12655 | uses\usato | 12653 | uses\usato |
12656 | usual\usuale, ordinario | 12654 | usual\usuale, ordinario |
12657 | usually\ordinario | 12655 | usually\ordinario |
12658 | usuries\usura | 12656 | usuries\usura |
12659 | usury\usura | 12657 | usury\usura |
12660 | Utopian\utopico | 12658 | Utopian\utopico |
12661 | utter\estrinsecare | 12659 | utter\estrinsecare |
12662 | vacant\vacante | 12660 | vacant\vacante |
12663 | vacation\vacanze, ferie | 12661 | vacation\vacanze, ferie |
12664 | vaccinate\vaccinare | 12662 | vaccinate\vaccinare |
12665 | vaccination\vaccinazione | 12663 | vaccination\vaccinazione |
12666 | vaccine\vaccino | 12664 | vaccine\vaccino |
12667 | vacuum\vuotaggine | 12665 | vacuum\vuotaggine |
12668 | vacuum cleaner\aspirapòlvere | 12666 | vacuum cleaner\aspirapòlvere |
12669 | vagabond\vagabondaggio | 12667 | vagabond\vagabondaggio |
12670 | vagina\fòdero | 12668 | vagina\fòdero |
12671 | vailable\disponìbile | 12669 | vailable\disponìbile |
12672 | vain\vano | 12670 | vain\vano |
12673 | valerian\valeriana | 12671 | valerian\valeriana |
12674 | valid\valevole | 12672 | valid\valevole |
12675 | validity\validità | 12673 | validity\validità |
12676 | validness\validità | 12674 | validness\validità |
12677 | valley\valle | 12675 | valley\valle |
12678 | valorize\valorizzare | 12676 | valorize\valorizzare |
12679 | valse\valzer | 12677 | valse\valzer |
12680 | valuable\pregiato | 12678 | valuable\pregiato |
12681 | valuables\valori | 12679 | valuables\valori |
12682 | value\valutare, valore | 12680 | value\valutare, valore |
12683 | valuejudgment\valutazione | 12681 | valuejudgment\valutazione |
12684 | valve\valvola, valvola | 12682 | valve\valvola, valvola |
12685 | vanguard\avanguardia | 12683 | vanguard\avanguardia |
12686 | vanilla\vainiglia | 12684 | vanilla\vainiglia |
12687 | vanish\scomparire | 12685 | vanish\scomparire |
12688 | vanity\fatuità | 12686 | vanity\fatuità |
12689 | vaporizer\vaporizzatore | 12687 | vaporizer\vaporizzatore |
12690 | vapors\evaporazione | 12688 | vapors\evaporazione |
12691 | vapour\vapore | 12689 | vapour\vapore |
12692 | variable\variàbile | 12690 | variable\variàbile |
12693 | variance\contrarietà | 12691 | variance\contrarietà |
12694 | variation\aberrazione | 12692 | variation\aberrazione |
12695 | varicosity\varice | 12693 | varicosity\varice |
12696 | various\differente | 12694 | various\differente |
12697 | variousness\varietà | 12695 | variousness\varietà |
12698 | varnish\vernice | 12696 | varnish\vernice |
12699 | vary\variare | 12697 | vary\variare |
12700 | vascular\recipiente | 12698 | vascular\recipiente |
diff --git a/noncore/apps/opie-console/filereceive.cpp b/noncore/apps/opie-console/filereceive.cpp index e387273..452be60 100644 --- a/noncore/apps/opie-console/filereceive.cpp +++ b/noncore/apps/opie-console/filereceive.cpp | |||
@@ -75,88 +75,88 @@ void FileReceive::receive( const QString& dir ) { | |||
75 | char resultByte; int len; | 75 | char resultByte; int len; |
76 | len = read(m_info[0], &resultByte, 1 ); | 76 | len = read(m_info[0], &resultByte, 1 ); |
77 | /* len == 1 start up failed */ | 77 | /* len == 1 start up failed */ |
78 | if ( len == 1 ) { | 78 | if ( len == 1 ) { |
79 | emit error( StartError, tr("Could not start") ); | 79 | emit error( StartError, tr("Could not start") ); |
80 | return; | 80 | return; |
81 | } | 81 | } |
82 | if ( len == -1 ) | 82 | if ( len == -1 ) |
83 | if ( (errno == ECHILD ) || (errno == EINTR ) ) | 83 | if ( (errno == ECHILD ) || (errno == EINTR ) ) |
84 | continue; | 84 | continue; |
85 | 85 | ||
86 | // len == 0 or something like this | 86 | // len == 0 or something like this |
87 | break; | 87 | break; |
88 | } | 88 | } |
89 | 89 | ||
90 | if ( m_info[0] ) | 90 | if ( m_info[0] ) |
91 | close( m_info[0] ); | 91 | close( m_info[0] ); |
92 | 92 | ||
93 | m_not = new QSocketNotifier(m_comm[0], QSocketNotifier::Read ); | 93 | m_not = new QSocketNotifier(m_comm[0], QSocketNotifier::Read ); |
94 | connect(m_not, SIGNAL(activated(int) ), | 94 | connect(m_not, SIGNAL(activated(int) ), |
95 | this, SLOT(slotRead() ) ); | 95 | this, SLOT(slotRead() ) ); |
96 | if ( pipe(m_term) < 0 ) | 96 | if ( pipe(m_term) < 0 ) |
97 | m_term[0] = m_term[1] = 0; | 97 | m_term[0] = m_term[1] = 0; |
98 | 98 | ||
99 | ProcCtl::self()->add(m_pid, m_term[1] ); | 99 | ProcCtl::self()->add(m_pid, m_term[1] ); |
100 | m_proc = new QSocketNotifier(m_term[0], QSocketNotifier::Read ); | 100 | m_proc = new QSocketNotifier(m_term[0], QSocketNotifier::Read ); |
101 | connect(m_proc, SIGNAL(activated(int) ), | 101 | connect(m_proc, SIGNAL(activated(int) ), |
102 | this, SLOT(slotExec() ) ); | 102 | this, SLOT(slotExec() ) ); |
103 | 103 | ||
104 | } | 104 | } |
105 | break; | 105 | break; |
106 | 106 | ||
107 | } | 107 | } |
108 | 108 | ||
109 | } | 109 | } |
110 | void FileReceive::cancel() { | 110 | void FileReceive::cancel() { |
111 | ::kill(m_pid, 9 ); | 111 | ::kill(m_pid, 9 ); |
112 | } | 112 | } |
113 | void FileReceive::setupChild() { | 113 | void FileReceive::setupChild() { |
114 | changeDir( currentDir() ); | 114 | changeDir( currentDir() ); |
115 | /* | 115 | /* |
116 | * we do not want to read from our | 116 | * we do not want to read from our |
117 | * information channel | 117 | * information channel |
118 | */ | 118 | */ |
119 | if (m_info[0] ) | 119 | if (m_info[0] ) |
120 | close(m_info[0] ); | 120 | close(m_info[0] ); |
121 | /* | 121 | /* |
122 | * FD_CLOEXEC will close the | 122 | * FD_CLOEXEC will close the |
123 | * fd on successfull exec | 123 | * fd on successful exec |
124 | */ | 124 | */ |
125 | if (m_info[1] ) | 125 | if (m_info[1] ) |
126 | fcntl(m_info[1], F_SETFD, FD_CLOEXEC ); | 126 | fcntl(m_info[1], F_SETFD, FD_CLOEXEC ); |
127 | 127 | ||
128 | if (m_comm[0] ) | 128 | if (m_comm[0] ) |
129 | close( m_comm[0] ); | 129 | close( m_comm[0] ); |
130 | /* | 130 | /* |
131 | * now set the communication | 131 | * now set the communication |
132 | * m_fd STDIN_FILENO | 132 | * m_fd STDIN_FILENO |
133 | * STDOUT_FILENO | 133 | * STDOUT_FILENO |
134 | * STDERR_FILENO | 134 | * STDERR_FILENO |
135 | */ | 135 | */ |
136 | dup2( m_fd, STDIN_FILENO ); | 136 | dup2( m_fd, STDIN_FILENO ); |
137 | dup2( m_fd, STDOUT_FILENO ); | 137 | dup2( m_fd, STDOUT_FILENO ); |
138 | dup2( m_comm[1], STDERR_FILENO ); | 138 | dup2( m_comm[1], STDERR_FILENO ); |
139 | } | 139 | } |
140 | void FileReceive::slotRead() { | 140 | void FileReceive::slotRead() { |
141 | QByteArray ar(4096); | 141 | QByteArray ar(4096); |
142 | int len = read(m_comm[0], ar.data(), 4096 ); | 142 | int len = read(m_comm[0], ar.data(), 4096 ); |
143 | for (int i = 0; i < len; i++ ) { | 143 | for (int i = 0; i < len; i++ ) { |
144 | // printf("%c", ar[i] ); | 144 | // printf("%c", ar[i] ); |
145 | } | 145 | } |
146 | ar.resize( len ); | 146 | ar.resize( len ); |
147 | QString str( ar ); | 147 | QString str( ar ); |
148 | } | 148 | } |
149 | void FileReceive::slotExec() { | 149 | void FileReceive::slotExec() { |
150 | char buf[2]; | 150 | char buf[2]; |
151 | ::read(m_term[0], buf, 1 ); | 151 | ::read(m_term[0], buf, 1 ); |
152 | delete m_proc; | 152 | delete m_proc; |
153 | delete m_not; | 153 | delete m_not; |
154 | m_not = m_proc = 0l; | 154 | m_not = m_proc = 0l; |
155 | close( m_term[0] ); | 155 | close( m_term[0] ); |
156 | close( m_term[1] ); | 156 | close( m_term[1] ); |
157 | close( m_comm[0] ); | 157 | close( m_comm[0] ); |
158 | close( m_comm[1] ); | 158 | close( m_comm[1] ); |
159 | layer()->closeRawIO(m_fd); | 159 | layer()->closeRawIO(m_fd); |
160 | emit received(QString::null); | 160 | emit received(QString::null); |
161 | 161 | ||
162 | } | 162 | } |
diff --git a/noncore/apps/opie-console/filetransfer.cpp b/noncore/apps/opie-console/filetransfer.cpp index 221838c..5144941 100644 --- a/noncore/apps/opie-console/filetransfer.cpp +++ b/noncore/apps/opie-console/filetransfer.cpp | |||
@@ -96,97 +96,97 @@ void FileTransfer::sendFile( const QString& file ) { | |||
96 | if ( len == -1 ) | 96 | if ( len == -1 ) |
97 | if ( (errno == ECHILD ) || (errno == EINTR ) ) | 97 | if ( (errno == ECHILD ) || (errno == EINTR ) ) |
98 | continue; | 98 | continue; |
99 | 99 | ||
100 | // len == 0 or something like this | 100 | // len == 0 or something like this |
101 | break; | 101 | break; |
102 | } | 102 | } |
103 | if ( m_info[0] ) | 103 | if ( m_info[0] ) |
104 | close( m_info[0] ); | 104 | close( m_info[0] ); |
105 | 105 | ||
106 | 106 | ||
107 | 107 | ||
108 | /* replace by QSocketNotifier!!! */ | 108 | /* replace by QSocketNotifier!!! */ |
109 | m_not = new QSocketNotifier(m_comm[0], QSocketNotifier::Read ); | 109 | m_not = new QSocketNotifier(m_comm[0], QSocketNotifier::Read ); |
110 | connect(m_not, SIGNAL(activated(int) ), | 110 | connect(m_not, SIGNAL(activated(int) ), |
111 | this, SLOT(slotRead() ) ); | 111 | this, SLOT(slotRead() ) ); |
112 | if ( pipe(m_term) < 0 ) | 112 | if ( pipe(m_term) < 0 ) |
113 | m_term[0] = m_term[1] = 0; | 113 | m_term[0] = m_term[1] = 0; |
114 | 114 | ||
115 | ProcCtl::self()->add(m_pid, m_term[1] ); | 115 | ProcCtl::self()->add(m_pid, m_term[1] ); |
116 | m_proc = new QSocketNotifier(m_term[0], QSocketNotifier::Read ); | 116 | m_proc = new QSocketNotifier(m_term[0], QSocketNotifier::Read ); |
117 | connect(m_proc, SIGNAL(activated(int) ), | 117 | connect(m_proc, SIGNAL(activated(int) ), |
118 | this, SLOT(slotExec() ) ); | 118 | this, SLOT(slotExec() ) ); |
119 | 119 | ||
120 | } | 120 | } |
121 | break; | 121 | break; |
122 | } | 122 | } |
123 | } | 123 | } |
124 | /* | 124 | /* |
125 | * let's call the one with the filename | 125 | * let's call the one with the filename |
126 | */ | 126 | */ |
127 | void FileTransfer::sendFile( const QFile& file ) { | 127 | void FileTransfer::sendFile( const QFile& file ) { |
128 | sendFile( file.name() ); | 128 | sendFile( file.name() ); |
129 | } | 129 | } |
130 | 130 | ||
131 | /* | 131 | /* |
132 | * setting up communication | 132 | * setting up communication |
133 | * between parent child and ioLayer | 133 | * between parent child and ioLayer |
134 | */ | 134 | */ |
135 | void FileTransfer::setupChild() { | 135 | void FileTransfer::setupChild() { |
136 | /* | 136 | /* |
137 | * we do not want to read from our | 137 | * we do not want to read from our |
138 | * information channel | 138 | * information channel |
139 | */ | 139 | */ |
140 | if (m_info[0] ) | 140 | if (m_info[0] ) |
141 | close(m_info[0] ); | 141 | close(m_info[0] ); |
142 | /* | 142 | /* |
143 | * FD_CLOEXEC will close the | 143 | * FD_CLOEXEC will close the |
144 | * fd on successfull exec | 144 | * fd on successful exec |
145 | */ | 145 | */ |
146 | if (m_info[1] ) | 146 | if (m_info[1] ) |
147 | fcntl(m_info[1], F_SETFD, FD_CLOEXEC ); | 147 | fcntl(m_info[1], F_SETFD, FD_CLOEXEC ); |
148 | 148 | ||
149 | if (m_comm[0] ) | 149 | if (m_comm[0] ) |
150 | close( m_comm[0] ); | 150 | close( m_comm[0] ); |
151 | /* | 151 | /* |
152 | * now set the communication | 152 | * now set the communication |
153 | * m_fd STDIN_FILENO | 153 | * m_fd STDIN_FILENO |
154 | * STDOUT_FILENO | 154 | * STDOUT_FILENO |
155 | * STDERR_FILENO | 155 | * STDERR_FILENO |
156 | */ | 156 | */ |
157 | dup2( m_fd, STDIN_FILENO ); | 157 | dup2( m_fd, STDIN_FILENO ); |
158 | dup2( m_fd, STDOUT_FILENO ); | 158 | dup2( m_fd, STDOUT_FILENO ); |
159 | dup2( m_comm[1], STDERR_FILENO ); | 159 | dup2( m_comm[1], STDERR_FILENO ); |
160 | } | 160 | } |
161 | 161 | ||
162 | /* | 162 | /* |
163 | * read from the stderr of the child | 163 | * read from the stderr of the child |
164 | * process | 164 | * process |
165 | */ | 165 | */ |
166 | void FileTransfer::slotRead() { | 166 | void FileTransfer::slotRead() { |
167 | QByteArray ar(4096); | 167 | QByteArray ar(4096); |
168 | int len = read(m_comm[0], ar.data(), 4096 ); | 168 | int len = read(m_comm[0], ar.data(), 4096 ); |
169 | for (int i = 0; i < len; i++ ) { | 169 | for (int i = 0; i < len; i++ ) { |
170 | // printf("%c", ar[i] ); | 170 | // printf("%c", ar[i] ); |
171 | } | 171 | } |
172 | ar.resize( len ); | 172 | ar.resize( len ); |
173 | QString str( ar ); | 173 | QString str( ar ); |
174 | QStringList lis = QStringList::split(' ', str ); | 174 | QStringList lis = QStringList::split(' ', str ); |
175 | /* | 175 | /* |
176 | * Transfer finished.. either complete or incomplete | 176 | * Transfer finished.. either complete or incomplete |
177 | */ | 177 | */ |
178 | if ( lis[0].simplifyWhiteSpace() == "Transfer" ) { | 178 | if ( lis[0].simplifyWhiteSpace() == "Transfer" ) { |
179 | return; | 179 | return; |
180 | } | 180 | } |
181 | /* | 181 | /* |
182 | * do progress reading | 182 | * do progress reading |
183 | */ | 183 | */ |
184 | slotProgress( lis ); | 184 | slotProgress( lis ); |
185 | 185 | ||
186 | 186 | ||
187 | } | 187 | } |
188 | /* | 188 | /* |
189 | * find the progress | 189 | * find the progress |
190 | */ | 190 | */ |
191 | void FileTransfer::slotProgress( const QStringList& list ) { | 191 | void FileTransfer::slotProgress( const QStringList& list ) { |
192 | if ( m_type != SZ ) | 192 | if ( m_type != SZ ) |