diff options
author | Michael Vogt <mvo@debian.org> | 2014-04-28 13:41:33 +0200 |
---|---|---|
committer | Michael Vogt <mvo@debian.org> | 2014-04-28 13:41:33 +0200 |
commit | 3163087b04ca5c297a7c98c018ba5c30e850a11e (patch) | |
tree | b9c2484a5af75bbdf0c96b56fd724f9e81a6897d /cmdline/apt-get.cc | |
parent | a6f22547948f1f998c754850c9ddeb3cba784873 (diff) |
Fix missing ScreenWidth check in apt.cc
Diffstat (limited to 'cmdline/apt-get.cc')
-rw-r--r-- | cmdline/apt-get.cc | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index caf69da2a..566103f8c 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1666,20 +1666,6 @@ static bool ShowHelp(CommandLine &) return true; } /*}}}*/ -// SigWinch - Window size change signal handler /*{{{*/ -// --------------------------------------------------------------------- -/* */ -static void SigWinch(int) -{ - // Riped from GNU ls -#ifdef TIOCGWINSZ - struct winsize ws; - - if (ioctl(1, TIOCGWINSZ, &ws) != -1 && ws.ws_col >= 5) - ScreenWidth = ws.ws_col - 1; -#endif -} - /*}}}*/ int main(int argc,const char *argv[]) /*{{{*/ { CommandLine::Dispatch Cmds[] = {{"update",&DoUpdate}, @@ -1734,14 +1720,12 @@ int main(int argc,const char *argv[]) /*{{{*/ // see if we are in simulate mode CheckSimulateMode(CmdL); + // Init the signals + InitSignals(); + // Setup the output streams InitOutput(); - // Setup the signals - signal(SIGPIPE,SIG_IGN); - signal(SIGWINCH,SigWinch); - SigWinch(0); - // Match the operation CmdL.DispatchArg(Cmds); |